[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1349'

[nickm at torproject.org]

commit 40a22fb70787b4c457491bba1888ac07a4c82440
Merge: 7157d80c6 83fa962c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 25 13:07:19 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1349'

 changes/bug31408                                   |  5 ++
 src/lib/fs/conffile.c                              | 10 ++--
 src/test/conf_examples/include_bug_31408/expected  |  2 +
 .../include_bug_31408/included/01_nickname.inc     |  1 +
 .../include_bug_31408/included/02_no_configs.inc   |  3 +
 src/test/conf_examples/include_bug_31408/torrc     |  2 +
 src/test/test_config.c                             | 68 ++++++++++++++++++++++
 7 files changed, 87 insertions(+), 4 deletions(-)