[tor-commits] [tor/master] Merge branch 'bug31408_035' into bug31408_master

[nickm at torproject.org]

commit 876b3e277555cff8e51102ef62d6133f9e4677ac
Merge: e1429d914 0614f8390
Author: teor <teor at torproject.org>
Date:   Tue Sep 24 11:07:38 2019 +1000

    Merge branch 'bug31408_035' into bug31408_master

 changes/bug31408       |  5 ++++
 src/lib/fs/conffile.c  | 10 +++++---
 src/test/test_config.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 4 deletions(-)