[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug3825c'

[nickm@xxxxxxxxxxxxxx]

commit 0c2a3601e8283f3a63f624cfe2c54d21cae62fa3
Merge: cc3f0ba b095be7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Oct 23 12:55:10 2011 -0400

    Merge remote-tracking branch 'rransom-tor/bug3825c'

 src/or/circuitlist.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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