commit 6b670d6032b33f255f88e31a727b8f042b1dfcef Merge: 586d0ab bc3c54a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 7 11:08:03 2011 -0400 Merge branch 'bug3263' changes/bug3263 | 4 ++++ src/or/config.c | 3 ++- src/or/router.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletions(-)