commit d8b7dcca8de8894c147571dd3e259f00a708e348 Merge: 732c885 066acaf Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 13 12:50:55 2015 -0500 Merge remote-tracking branch 'andrea/ticket12585_v3' changes/bug12585 | 9 ++++ doc/tor.1.txt | 11 +++- src/common/address.c | 18 +++++++ src/or/config.c | 110 +++++++++++++++++++++++++++++++++---- src/or/connection.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- src/or/main.c | 4 ++ src/or/or.h | 8 +++ src/or/relay.c | 4 +- 8 files changed, 268 insertions(+), 42 deletions(-)