commit f348daa6fb58295d876495ba875b826e87917ec9 Merge: 4703bf8 734fad4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 29 10:53:09 2012 -0400 Merge remote-tracking branch 'linus/bug4875_2' changes/bug4875 | 3 ++ src/common/address.h | 2 + src/or/config.c | 1 + src/or/router.c | 57 +++++++++++++++++++++++++++---------------------- 4 files changed, 37 insertions(+), 26 deletions(-)