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

[nickm at torproject.org]

commit 8f893fbca92f1e190ac056a21abc9e4c1a29b236
Merge: 2db858e 9d37449
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:51:58 2017 -0500

    Merge remote-tracking branch 'public/bug20974'

 changes/bug20974   |  5 +++++
 src/or/directory.c | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)