commit 4f5a116618fdb1707905c2fc602a216f7da22e6e Merge: 474369e3fa 3f442987f1 Author: George Kadianakis desnacked@riseup.net Date: Tue Nov 3 13:04:09 2020 +0200

Merge remote-tracking branch 'tor-gitlab/mr/187' into master

changes/ticket18888 | 3 +++ src/app/main/include.am | 2 ++ src/app/main/main.c | 12 +++++++++++- src/app/main/risky_options.c | 35 +++++++++++++++++++++++++++++++++++ src/app/main/risky_options.h | 17 +++++++++++++++++ 5 files changed, 68 insertions(+), 1 deletion(-)