commit 73ee161d8a7bc06eefa58654cbfe421449921eec Merge: e07206a 3c2c6a6 Author: Nick Mathewson <[email protected]> Date: Wed Sep 10 23:48:59 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
changes/bug13096 | 4 ++++
src/or/routerlist.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
