[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug3963' into maint-0.2.2

[nickm at torproject.org]

commit b3c988f0d7e18c243074e3e583c10b204521088f
Merge: fbcd7c0 45eadf3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 21 10:52:15 2011 -0500

    Merge remote-tracking branch 'public/bug3963' into maint-0.2.2

 changes/bug3963 |    5 +++++
 src/or/ntmain.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)