[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5

[teor at torproject.org]

commit 4662cbec7bd33fee973e467615ab30933138c279
Merge: 190386f1c 4ab1d1c0c
Author: teor <teor at torproject.org>
Date:   Fri Aug 30 23:20:59 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5

 changes/bug30894           | 4 ++++
 src/app/config/confparse.c | 1 +
 2 files changed, 5 insertions(+)