[tor-commits] [tor/release-0.2.2] Merge branch 'bug5796_022_squashed' into maint-0.2.2

[arma@xxxxxxxxxxxxxx]

commit 5905a0b2dbcff8bd07e179750f53a8f010b4a5e0
Merge: 0be946c f2a6eed
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue May 15 10:04:49 2012 -0400

    Merge branch 'bug5796_022_squashed' into maint-0.2.2

 changes/bug5796  |    4 ++++
 src/or/control.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits