[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm@xxxxxxxxxxxxxx]

commit 85d4c290d79264d334baa9e5c8fdf3b06d0b3d79
Merge: 209229f 010b8dd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 17 15:24:23 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

 changes/abandon-rend-circs-on-newnym |    8 ++++++++
 src/or/circuituse.c                  |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)

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