commit 01c5d4583f3bc33c2c00b16ea269a2b03f5ac55e Merge: 7d1e47559 ae8683621 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)