commit 41e0f7146a0377fb67858433deb4d9f4d7e95327 Merge: 47cfee7 178599f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 14 14:55:49 2013 -0500 Merge remote-tracking branch 'arma/bug1992' changes/bug1992 | 11 +++++++++++ src/or/config.c | 7 +++++++ src/or/config.h | 1 + src/or/main.c | 13 ++++--------- src/or/router.c | 8 ++++++-- src/or/routerlist.c | 3 ++- 6 files changed, 31 insertions(+), 12 deletions(-)