[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug5231'

[nickm@xxxxxxxxxxxxxx]

commit 6a0d809f44afa4c20382030191bd69cf0017d03a
Merge: 406bc95 2755b09
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 29 15:16:15 2012 -0500

    Merge remote-tracking branch 'sebastian/bug5231'

 changes/bug5231      |    5 +++++
 src/or/circuitlist.c |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

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