commit 43f4324e29855bced51cb9c8f126bfb35e93fb2c Merge: 3121e5c10 c4fb3bfed Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 21 10:08:48 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1899/head' changes/ticket34211 | 3 +++ src/app/main/main.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)