commit d6570eaf5d8690799a1b698552315372fae2e1f0 Merge: b18e274919 29307c0625 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 20 16:37:11 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/59'

changes/feature40047 | 6 ++ scripts/maint/practracker/exceptions.txt | 8 +-- src/app/config/config.c | 7 +++ src/app/main/main.c | 9 ++- src/lib/osinfo/include.am | 6 +- src/lib/osinfo/libc.c | 66 ++++++++++++++++++++++ src/lib/osinfo/libc.h | 19 +++++++ .../conf_examples/crypto_accel/expected_log_nss | 2 +- .../crypto_accel_req/expected_log_nss | 2 +- src/test/conf_examples/lzma_zstd_1/expected_log | 2 +- .../conf_examples/lzma_zstd_1/expected_log_lzma | 2 +- .../lzma_zstd_1/expected_log_lzma_zstd | 2 +- .../conf_examples/lzma_zstd_1/expected_log_zstd | 2 +- src/test/conf_examples/nss_1/expected_log | 2 +- src/test/conf_examples/nss_1/expected_log_nss | 2 +- src/test/test_parseconf.sh | 2 +- 16 files changed, 122 insertions(+), 17 deletions(-)