commit fbb74fb37cc0497be2e88e35787cc314f04c6478 Merge: 24f769832 ae608408e Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:43:51 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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