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

[nickm at torproject.org]

commit 6d375e1cb7577e414b8e9412a7b53a63d1932596
Merge: a8fba6e1d 26bbeb298
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:56:22 2018 -0500

    Merge branch 'maint-0.3.5' into release-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(-)