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

[nickm@xxxxxxxxxxxxxx]

commit 7c2eabcf8e68aee149bff1d5c9f11eff14152bc7
Merge: a87f22e 3412054
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 20 14:47:49 2013 -0400

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

 changes/bug8475 |    4 ++++
 src/or/relay.c  |   13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

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