commit b75d1daf40c0d104b8224df337949753a5e65e74 Merge: bb6d45a 6a829a3 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 26 13:10:54 2011 -0400

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

src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)

diff --cc src/or/dnsserv.c index f7a8d35,63ecbd2..243b730 --- 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,