commit c29f05b159ae51472cd2a183a36cb9d352c082e5 Merge: cdd7e8897 870874fec Author: George Kadianakis desnacked@riseup.net Date: Thu Sep 5 17:06:58 2019 +0300

Merge branch 'tor-github/pr/1292'

changes/ticket31529 | 5 +++++ src/app/config/confparse.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)