commit ca597efb2288996f3fae763f3c01849402ac6514
Merge: 6d027a3 9dfb884
Author: Nick Mathewson <[email protected]>
Date: Fri Oct 7 16:46:50 2011 -0400
Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2
changes/dirreq-stats-default | 4 ++
src/or/config.c | 63 +++++++++++++++++++++--------------------
2 files changed, 36 insertions(+), 31 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
