[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 94752b3fa6b133cda02465b24890b3d218cb1fd8
Merge: 059c441d2 e5a83062e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 08:13:14 2017 -0500

    Merge branch 'maint-0.3.2' into release-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(-)