commit 9309eaf8ead0058aed6f1399b63fc8ae54cef799 Merge: 3778b97ca db329522e Author: George Kadianakis desnacked@riseup.net Date: Thu Oct 3 19:13:57 2019 +0300

Merge branch 'tor-github/pr/1377'

changes/bug31854 | 3 +++ src/lib/log/log.c | 22 ++++++++++++---------- src/lib/log/log.h | 13 ++++++++++++- src/test/test_options.c | 6 +++--- 4 files changed, 30 insertions(+), 14 deletions(-)