[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6252_again' into maint-0.2.3

[arma at torproject.org]

commit 91b52a259a271df7ceeea6d8bf7adbd4d7e15a6c
Merge: 93be3a8 393944d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 10:50:11 2012 -0400

    Merge remote-tracking branch 'public/bug6252_again' into maint-0.2.3

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