commit 2c7ed0406f04caa1609014f66c08964c8b38d0b9 Merge: 7b1b8c3 7dbf667 Author: Nick Mathewson <[email protected]> Date: Thu Oct 10 11:23:46 2013 -0400
Merge branch 'bug9644_024' into maint-0.2.4
changes/bug9644 | 4 ++++
src/or/routerlist.c | 29 ++++++++++++++++++++++-------
2 files changed, 26 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
