commit 20569f9297fad0874c68a069fe9032c84dc583c6
Merge: b3820e0 35fcec3
Author: Roger Dingledine <[email protected]>
Date: Sun Mar 6 20:21:46 2011 -0500
Merge branch 'maint-0.2.2' into release-0.2.2
changes/all_descs | 4 ++++
changes/ipv6_crash | 4 ++++
src/or/dirserv.c | 2 ++
src/or/policies.c | 2 ++
src/or/routerparse.c | 6 ++++++
5 files changed, 18 insertions(+), 0 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
