commit ceeacc734da441051e8c3cfbab420b7083af89b7 Merge: bf8a7201c ae8683621 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 15 14:25:25 2017 -0500

Merge branch 'maint-0.3.2'

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