commit f41374b035cc1e605db5a82ede6b391c9cdcd0a0 Merge: 6b2c1d62a 1043532a5 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 14 07:55:07 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug28419 | 3 +++ src/tools/tor_runner.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)