commit fb56b4c2bffe5d1d752694901b1853d89e3fb8cc Merge: c750ec20a 03ce67d37 Author: George Kadianakis <desnacked@riseup.net> Date: Thu Sep 5 17:10:07 2019 +0300 Merge branch 'tor-github/pr/1293' src/lib/conf/conftypes.h | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)