commit 6917728637bdbaed86d48d394eab6a063c319269 Merge: e676db6 5f182ea Author: Roger Dingledine <[email protected]> Date: Sun May 29 19:11:07 2011 -0400
Merge branch 'maint-0.2.2'
src/or/circuitbuild.c | 2 +-
src/or/main.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
