[tor-commits] [tor/master] Merge branch 'bug26488'

[nickm at torproject.org]

commit a1a55a33c20364ccbc0540125d662203152a20c2
Merge: 03283c00d 46998fc8f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:37:14 2018 -0400

    Merge branch 'bug26488'

 changes/bug26488        |  4 ++++
 src/app/config/config.c | 17 +++++++++++++++++
 src/test/test_config.c  | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)