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

[nickm at torproject.org]

commit b2e1910017ca19783871877456205aa4a0bee4a6
Merge: 00aeecb39 85778dc92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 09:23:07 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23861   | 5 +++++
 src/or/directory.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)