commit fc760c5088394741ac8c83706be6b737aef79beb Merge: 4673cb816 d30a042fa Author: George Kadianakis desnacked@riseup.net Date: Mon Sep 30 13:47:06 2019 +0300

Merge branch 'tor-github/pr/1356'

changes/bug31334 | 4 ++++ src/lib/log/log.c | 4 ---- src/lib/log/log.h | 6 ++++++ src/test/fuzz/fuzzing_common.c | 2 +- src/test/test_logging.c | 2 +- src/test/test_options.c | 6 +++--- src/test/testing_common.c | 4 ++-- 7 files changed, 17 insertions(+), 11 deletions(-)