[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1671'

[teor at torproject.org]

commit 0b82b5ee4248d8dce60556524b08419cec90d214
Merge: 697527764 c8b6392b4
Author: teor <teor at torproject.org>
Date:   Mon Jan 20 15:40:42 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1671'

 changes/bug32778                   |  3 ++
 changes/bug32883                   |  5 ----
 src/app/main/main.c                | 11 ++-----
 src/app/main/main.h                |  3 ++
 src/app/main/ntmain.c              | 59 +++++++++++++++++++++++++++-----------
 src/feature/api/tor_api_internal.h |  5 ----
 6 files changed, 50 insertions(+), 36 deletions(-)