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

[arma at torproject.org]

commit 1fee920999bb51e2831b03faff7dabbcf20355e7
Merge: 7e1a0bb 27ec024
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jul 6 08:59:26 2012 -0400

    Merge branch 'maint-0.2.3'

 changes/bug6271 |    7 +++++++
 src/or/relay.c  |    7 ++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)