commit 1ad96ed9cda1573cfd9f0a388ac28bfeaf3b62aa Merge: 9025991 d46c1b4 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 12 09:20:56 2016 -0500

Merge remote-tracking branch 'rubiate/ticket20511'

changes/20511 | 3 +++ src/or/directory.c | 31 ++++++++++++++++++++++ src/or/networkstatus.c | 21 +++++++++++++-- src/or/networkstatus.h | 2 ++ src/test/test_dir_handle_get.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 2 deletions(-)