commit 5a21b27083640aec1e23e21cdfcad02625659e05 Merge: 7c2f688fb f2e23d38a Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 11:43:14 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)