[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug5151'

[nickm at torproject.org]

commit 04a1696095f936e68b524ac3c4881bf404e450a5
Merge: 77bc1b8 bd4d8fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 28 17:18:30 2012 -0400

    Merge remote-tracking branch 'linus/bug5151'

 changes/bug5151 |    4 ++++
 src/or/config.c |    8 ++++----
 src/or/router.c |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)