[tor-commits] [tor/master] Merge remote-tracking branch 'imnotbad/bug26663'

[nickm at torproject.org]

commit a7ec493d88bfdd2735ee50893dfa890e60900e2b
Merge: 66074ad1e abeb07a1b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 12 08:59:23 2018 -0400

    Merge remote-tracking branch 'imnotbad/bug26663'

 changes/ticket26663        |  3 +++
 src/app/config/config.c    |  2 +-
 src/app/config/confparse.c |  2 +-
 src/test/test_config.c     | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)