[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1

[nickm at torproject.org]

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b
Merge: 0cdd262 02d93ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 6 16:13:22 2011 -0400

    Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1

 changes/bug2402       |    4 ---
 changes/bug2402_redux |    6 +++++
 src/or/Makefile.am    |   60 ++++++++++--------------------------------------
 src/or/config.c       |   11 ++++++++-
 src/or/router.c       |    2 -
 5 files changed, 29 insertions(+), 54 deletions(-)