commit 0531d5155eddbbaca7c2a9d67e3954ee2599deb7
Merge: 903ec20 befd2e3
Author: Nick Mathewson <[email protected]>
Date: Fri Jul 1 10:00:37 2016 -0400
Merge remote-tracking branch 'teor/bug19530-v2'
changes/bug19530 | 6 +++
src/or/directory.c | 2 +-
src/or/directory.h | 4 +-
src/or/routerlist.c | 140 +++++++++++++++++++++++++++++++++-------------------
4 files changed, 99 insertions(+), 53 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
