commit be49fadad02e74a5d1a175ea8bd4b8855f8ec728 Merge: 853bbb911 e0276dc1c Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 26 09:03:21 2017 -0400

Merge branch 'maint-0.3.2'

changes/bug23682 | 5 +++++ src/or/directory.c | 4 ++-- src/or/main.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-)