commit 5b8bfb3df38ef3ebdccac3092585e310bef07059 Merge: 6992183 426f6bf Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 11 15:56:51 2011 -0400

Merge branch 'bug3512'

changes/bug3512 | 6 ++++++ src/common/address.c | 28 +++++++++++++++++++++------- src/common/address.h | 13 ++++++++----- src/or/circuituse.c | 4 ++-- src/or/config.c | 32 ++++++++++++++++---------------- src/or/connection.c | 4 ++-- src/or/connection_edge.c | 16 ++++++++-------- src/or/dirserv.c | 2 +- src/or/dns.c | 8 ++++---- src/or/rendservice.c | 2 +- src/or/routerparse.c | 8 ++++---- src/or/transports.c | 4 ++-- src/test/test_addr.c | 46 +++++++++++++++++++++++----------------------- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 15 files changed, 100 insertions(+), 77 deletions(-)