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

[nickm at torproject.org]

commit 17c63ff9f64c9f678f566bca70497992f5d4d04d
Merge: 4025cbada 77246dc0d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 16 10:24:39 2020 -0500

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

 src/app/main/main.c          |  2 +-
 src/lib/cc/compat_compiler.h | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)