commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 15 14:25:20 2017 -0500

Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)