commit fa6b80d6e510dd7027cc2dab50622bad4dc90064 Merge: aacbf55 b0bbe6b Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 9 08:29:21 2014 -0400 Merge remote-tracking branch 'public/bug10431' changes/bug10431 | 5 +++++ src/or/control.c | 7 ++++++- src/or/control.h | 2 +- src/or/or.h | 4 ++++ src/test/test_extorport.c | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --cc src/or/control.c index 7f421a7,43c0539..c917052 mode 100755,100644..100755 --- a/src/or/control.c +++ b/src/or/control.c