commit 1043532a5155cdd2667808e8db2e5de5c486ed8b Merge: 42be1c668 db3acb3aa Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 14 07:55:07 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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