commit 372df7a630afa4ffb0782287366b629916e0f728 Merge: 0af0f78df 26bbeb298 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 18 13:56:22 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)