Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug3369

@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - When asked about a DNS record type we don't support via a
+      client DNSPort, reply with NOTIMPL rather than an empty
+      reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.

changes/bug3393

@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+   - Fix a bug when using ControlSocketsGroupWritable with User. The
+     directory's group would be checked against the current group, not
+     the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix
+     on Tor 0.2.2.26-beta.

src/or/dnsserv.c

@@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
   }
   if (!q) {
     log_info(LD_APP, "None of the questions we got were ones we're willing "
-             "to support. Sending NODATA.");
-    evdns_server_request_respond(req, DNS_ERR_NONE);
+             "to support. Sending NOTIMPL.");
+    evdns_server_request_respond(req, DNS_ERR_NOTIMPL);
     return;
   }
   if (q->type != EVDNS_TYPE_A) {