commit 5230cc4fe7f80396304681ce2e9a1d0421920c40 Merge: fdbdaf8 f3b58df Author: Nick Mathewson <[email protected]> Date: Mon Apr 25 19:04:13 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug2971 | 6 ++++++
src/or/config.c | 4 +++-
2 files changed, 9 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
