commit 87de19eff48eb698da7275e358d56b327f849602 Merge: df1bae8f0 c55a05423 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:43:51 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

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