[tor-commits] [tor/maint-0.3.5] Merge branch 'bug28612_squashed' into maint-0.3.5

[nickm at torproject.org]

commit 26bbeb298d1f5692bc18f38d61379087436461a2
Merge: 702fd6f0f 1c2abea30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:55:57 2018 -0500

    Merge branch 'bug28612_squashed' into maint-0.3.5

 changes/bug28612      | 4 ++++
 src/app/main/main.c   | 2 +-
 src/app/main/main.h   | 2 ++
 src/app/main/ntmain.c | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)