Merge remote-tracking branch 'tor-github/pr/1517'
commitc34fb3413dee5be00be7299a63c294ddb86b0599
authorteor <teor@torproject.org>
Mon, 18 Nov 2019 01:21:37 +0000 (18 11:21 +1000)
committerteor <teor@torproject.org>
Mon, 18 Nov 2019 01:21:37 +0000 (18 11:21 +1000)
tree61bf8e02a341314267f8820ea7ebcc50259f27a7
parent183f89ccacdf7ca140f6d83345a9389e94119f5e
parent59ba61a69050edacb560a9fa6ad302346e14095e
Merge remote-tracking branch 'tor-github/pr/1517'
src/app/config/config.c