commit 9eeb902d1215afb54f26c91a5e6e372b9b2553f2 Merge: f52cfbf 177cadf Author: Nick Mathewson <[email protected]> Date: Tue Apr 19 12:37:18 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug2948 | 7 +++++++
src/or/routerparse.c | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
