[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

[teor at torproject.org]

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442
Merge: fb541ffca 54eec5342
Author: teor <teor at torproject.org>
Date:   Thu Jan 30 07:54:39 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

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