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

[nickm at torproject.org]

commit fc5d960fbda217a301b4ec09d906992b74849c15
Merge: 0e207f9 edf0d5b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 12:40:30 2012 -0400

    Merge remote-tracking branch 'public/bug5541_v2'

 changes/bug5541 |    8 ++++++++
 src/or/relay.c  |    8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)