[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15942_v2_alternative'

commit 703254a8321788bd6d03ec5f335fe338916fef6f Merge: 61dac57 a09ec22 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 23 09:01:24 2016 -0400 Merge remote-tracking branch 'public/bug15942_v2_alternative' changes/bug15942 | 3 ++ src/or/directory.c | 129 ++++++++++++++++++++++++++++++++++++++++++++----- src/or/directory.h | 6 +++ src/or/entrynodes.c | 1 + src/or/networkstatus.c | 8 +-- src/or/or.h | 18 +++++++ src/or/routerlist.c | 3 ++ src/or/routerparse.c | 2 + src/test/test_dir.c | 69 ++++++++++++++++++++++++-- 9 files changed, 219 insertions(+), 20 deletions(-)