commit fc5a881bd3bd635be897fafdd4f9a30d5b2bed14
Merge: e30fb0a 8bfa596
Author: Nick Mathewson <[email protected]>
Date: Sun Nov 10 12:24:12 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
doc/tor.1.txt | 5 +++--
src/or/config.c | 22 +++++++++++-----------
src/or/router.c | 4 ++--
3 files changed, 16 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
