commit f38ecd5ac0f21d25c838be6004925372d26a45aa
Merge: 8b33928 30003e4
Author: Nick Mathewson <[email protected]>
Date: Thu Apr 28 18:14:50 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/forget-rend-descs-on-newnym | 12 ++++
src/or/config.c | 4 ++
src/or/main.c | 7 +++
src/or/rendclient.c | 103 +++++++++++++++++++++--------------
src/or/router.c | 8 ++--
5 files changed, 90 insertions(+), 44 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
