commit 20d6ac3530553bfc139a33d80248b2ffc9c3d7eb Merge: b0a7e0d f0d9e2d Author: Nick Mathewson <[email protected]> Date: Thu Apr 28 21:17:51 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug3012 | 5 +++++
src/or/config.c | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
