[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 0b21170085c2e868ac90f7771392681b5dfb0ad2
Merge: 0ea3a3a 91b52a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 10:52:45 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 changes/bug6252_again |   11 +++++++++++
 src/or/relay.c        |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)