Merge remote-tracking branch 'public/bug2332' into maint-0.2.2

diff --cc src/or/dnsserv.c
index f7a8d35f78d8d809914580fd9b0b7cf82b9594e4,63ecbd22663b6e667fcb7f9f529c6b1bb8c9f539..243b730cbfbd9ada56e9f7820548fec5b0a3bf71
--- 1/src/or/dnsserv.c
--- 2/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@@ -280,9 -280,8 +280,9 @@@ dnsserv_resolved(edge_connection_t *con
               conn->socks_request->command == SOCKS_COMMAND_RESOLVE) {
      evdns_server_request_add_a_reply(req,
                                       name,
-                                      1, (char*)answer, ttl);
+                                      1, answer, ttl);
    } else if (answer_type == RESOLVED_TYPE_HOSTNAME &&
 +             answer_len < 256 &&
               conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) {
      char *ans = tor_strndup(answer, answer_len);
      evdns_server_request_add_ptr_reply(req, NULL,

diff --cc src/or/eventdns.c
Simple merge