[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[arma at torproject.org]

commit c563551eefefdf5a8e5e32feb1ca84a517770fda
Merge: da876ae 120a745
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 28 15:56:37 2011 -0500

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

 changes/bug4786 |    9 +++++++++
 src/or/relay.c  |    4 ----
 2 files changed, 9 insertions(+), 4 deletions(-)