[tor-commits] [tor/master] Merge branch 'ticket32883'

[nickm@xxxxxxxxxxxxxx]

commit c2dc94d8ebcd5fdd1076abb41ff0ecee6c092f4f
Merge: dec11793b b6f099672
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 14 12:42:41 2020 -0500

    Merge branch 'ticket32883'

 changes/bug32883                   |  5 ++++
 src/app/main/main.c                | 22 ++++++++--------
 src/app/main/ntmain.c              | 52 +++++++++++++-------------------------
 src/app/main/ntmain.h              |  3 ++-
 src/feature/api/tor_api_internal.h |  5 ++++
 5 files changed, 40 insertions(+), 47 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits