[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm@xxxxxxxxxxxxxx]

commit f48daef299c7289ff867e1fc8b56834c8d96ece5
Merge: b163e80 8b4728e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 15 12:38:55 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug8180 |    7 +++++++
 src/or/config.c |    8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

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