commit 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 Merge: 2725a88 6d027a3 Author: Nick Mathewson <[email protected]> Date: Fri Oct 7 12:20:08 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug4201 | 5 +++++
src/or/main.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
