commit 8d962233f65022dc7fbc0466c981e3e7f2aea0c8
Merge: 24fbb9a 797ece0
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed May 11 13:20:51 2016 -0400
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8
changes/bug18816 | 2 --
src/or/routerlist.c | 16 ++++++----------
2 files changed, 6 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
