[tor-commits] [tor/master] Merge branch 'tor-github/pr/1327'

[asn at torproject.org]

commit 8377b610bd0821fc2c272aa6b105bb259f2efe7a
Merge: f6ea89024 8ad419744
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Sep 16 19:43:44 2019 +0300

    Merge branch 'tor-github/pr/1327'

 src/test/test_parseconf.sh | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)