commit 4b57ec6e5eabb822506416bc5cf0e291ff9c0053
Merge: 6917728 16cfca5
Author: Nick Mathewson <[email protected]>
Date: Mon May 30 12:33:54 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/circuituse.c
changes/bug1297a | 16 ++++++++++++++++
src/or/circuituse.c | 11 -----------
src/or/or.h | 5 +++++
src/or/rendclient.c | 11 +++++++++++
4 files changed, 32 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
