commit cca803e2b01a107f569433a85dd62f20c7803f27 Merge: 15c99be96 db3acb3aa Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 14 07:55:07 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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