[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2'

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