commit cd72850e08f39413d281a480a78f38838ddf42e9 Merge: 5ec751b38 bfc5f0997 Author: George Kadianakis desnacked@riseup.net Date: Mon Sep 16 15:22:18 2019 +0300

Merge branch 'tor-github/pr/1316'

changes/ticket31475 | 5 +++++ src/lib/confmgt/type_defs.c | 20 ++++++++++++++++++-- src/test/test_confparse.c | 16 ++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-)