commit e71dfb6344c0480523a1fef0a77bd3d270d62e26
Merge: 50249c7 92d7ee0
Author: Nick Mathewson <[email protected]>
Date: Wed May 11 12:28:37 2016 -0400
Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8
changes/bug18816 | 6 ++++++
src/or/routerlist.c | 35 +++++++++++++++++++++++++++++------
2 files changed, 35 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
