commit 1fcaeb60924d155e80a9579588a1b6c31e2174f7 Merge: 1e1cc43 4a351b4 Author: Roger Dingledine <[email protected]> Date: Tue Sep 13 18:32:00 2011 -0400
Merge branch 'maint-0.2.2'
changes/bug4014 | 3 +++
src/or/main.c | 7 ++++---
src/or/or.h | 4 +++-
src/or/router.c | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
