commit 95d4bff7849a1801085c1f28b3f7a54b3b814dd6 Merge: 09601c3c4d d75e7daaab Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 21 09:24:15 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/67' into maint-0.4.4

changes/bug27315 | 6 ++++++ src/lib/sandbox/sandbox.c | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-)

diff --cc src/lib/sandbox/sandbox.c index 2b4181e7f8,76aacb0834..066ecfe915 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@@ -458,7 -448,9 +462,9 @@@ is_libc_at_least(int major, int minor return 1; else return 0; -#else /* !(defined(CHECK_LIBC_VERSION)) */ +#else /* !defined(CHECK_LIBC_VERSION) */ + (void)major; + (void)minor; return 0; #endif /* defined(CHECK_LIBC_VERSION) */ }