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

[arma at torproject.org]

commit 6061cd584c129eb8b5ed24fb5ce686a0236913e4
Merge: ed2601f c32ec9c
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Jul 1 05:32:37 2012 -0400

    Merge branch 'maint-0.2.3'

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