[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2

[nickm at torproject.org]

commit a7a906603e0c7e3c8519a948b5adf43bfecf6f66
Merge: b75d1da 5114e3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 26 15:17:03 2011 -0400

    Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2

 changes/bug2917  |    4 ++++
 src/or/control.c |    3 ++-
 src/or/main.c    |   43 +------------------------------------------
 src/or/main.h    |    2 +-
 src/or/or.h      |    2 +-
 5 files changed, 9 insertions(+), 45 deletions(-)