commit 54ef039ba527acba4cbcde158b17674e91ede904 Merge: 37ef4f1 9c58873 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 13 16:23:16 2012 -0400 Merge branch 'bug5263_023' changes/bug5263 | 5 +++++ src/or/main.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-)