commit 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 Merge: d34fa32 ba3a5f8 Author: Nick Mathewson nickm@torproject.org Date: Fri May 19 08:46:13 2017 -0400

Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed2'

changes/feature1922 | 11 + doc/tor.1.txt | 7 + src/common/confline.c | 211 +++++++++++++++-- src/common/confline.h | 4 + src/common/util.c | 35 +++ src/common/util.h | 1 + src/config/torrc.sample.in | 9 + src/or/config.c | 11 +- src/or/confparse.h | 1 - src/or/control.c | 10 +- src/or/or.h | 3 + src/test/test_config.c | 549 +++++++++++++++++++++++++++++++++++++++++++++ src/test/test_util.c | 80 +++++++ 13 files changed, 908 insertions(+), 24 deletions(-)