commit 00acccac644c20803d11ef7e162ae327eb834cf7
Merge: e4f66bf7f 4ab1d1c0c
Author: George Kadianakis <desnacked(a)riseup.net>
Date: Wed Jun 26 10:51:12 2019 +0300
Merge branch 'tor-github/pr/1114' into maint-0.4.1
changes/bug30894 | 4 ++++
src/app/config/confparse.c | 1 +
2 files changed, 5 insertions(+)