commit f02007a3e4f999241abee19c92f662be390afac5 Merge: abff196c6 ece63105d Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 11:13:22 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)