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

[nickm at torproject.org]

commit 3f55b76360e849fcb6e7f4af7f21be3583c97dc9
Merge: 70ffd3b 7c8032c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 11:47:13 2012 -0400

    Merge remote-tracking branch 'public/bug5139'

 changes/bug5139 |    6 ++++++
 src/or/router.c |   15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)