commit 52d386c9b0507b09d4c3adb3e0916c1e14f7efe5 Merge: 319ce2258 16e71c7fb Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 17 08:54:12 2019 -0400

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

changes/bug30799 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/app/main/ntmain.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)