[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0

[nickm at torproject.org]

commit 2b3518b81fbec1eda8b8924a21c464f63bd1984d
Merge: b6efd77 518ef61
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:00:02 2017 -0500

    Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0

 changes/bug20711   |  7 +++++++
 src/or/directory.c | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)