commit a9de982c343b0d83078d8e46b1a06e483c8595ec Merge: 4a7e412 0600e8c Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 22 22:33:14 2012 -0400

Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3

changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-)