From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 Apr 2011 17:10:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
X-Git-Tag: tor-0.2.3.1-alpha~35^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b75d1daf40c0d104b8224df337949753a5e65e74;p=thirdparty%2Ftor.git

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

b75d1daf40c0d104b8224df337949753a5e65e74
diff --cc src/or/dnsserv.c
index f7a8d35f78,63ecbd2266..243b730cbf
--- a/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,