commit a546487287f8f9c6b7747e15eed03547f7ca0b1c Merge: 294d800 0f718a8 Author: Nick Mathewson nickm@torproject.org Date: Mon May 15 18:24:38 2017 -0400

Merge branch 'maint-0.3.0'

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