commit 42d6f3459053aaafbed2ab215e9e85ae5d594b5a Merge: 31b9b1a 85d4c29 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 17 15:25:18 2011 -0400

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

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