commit e0655708a20069a5f42476a25d62e9d3f8138d8c Merge: 84ddc4b 6d28986 Author: Nick Mathewson nickm@torproject.org Date: Fri May 11 11:52:51 2012 -0400

Merge remote-tracking branch 'asn/bug4865_take2'

changes/bug4865 | 4 +++ src/common/address.c | 17 +++++++++----- src/common/address.h | 9 ++++++- src/or/config.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 2 + src/or/router.c | 37 +++++++++++++++++++++---------- src/or/router.h | 1 + src/or/transports.c | 9 ++++--- 8 files changed, 115 insertions(+), 23 deletions(-)