commit c2c1fa6b95dacbfd4b128c40032286d798aa5893 Merge: b780e84f2 e5a83062e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 8 08:13:14 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23816 | 6 +++++ src/or/directory.c | 76 +++++++++++++++++++++++++++++++---------------------- src/or/directory.h | 10 ++++++- src/test/test_dir.c | 69 +++++++++++++++++++++++++++--------------------- 4 files changed, 99 insertions(+), 62 deletions(-)