[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3196'

[nickm at torproject.org]

commit 32d6acade8488e8f3b1a85585d5136bf9a8ca76f
Merge: ffc21b6 6757261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 01:02:27 2012 -0400

    Merge remote-tracking branch 'public/bug3196'

 changes/bug3196     |    7 +++++++
 src/or/routerlist.c |   11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)