diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
| commit | 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 (patch) | |
| tree | fe1cebe40b18b1409489d29fba8e1fcc809b7e0e /changes | |
| parent | d34fa32ece2179c18f8aeae0026d2b452956842f (diff) | |
| parent | ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a (diff) | |
| download | tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.tar.gz tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.zip | |
Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed2'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/feature1922 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/changes/feature1922 b/changes/feature1922 new file mode 100644 index 0000000000..e3c059d4a5 --- /dev/null +++ b/changes/feature1922 @@ -0,0 +1,11 @@ + o Minor feature (include on config files): + - Allow the use of %include on configuration files to include settings + from other files or directories. Using %include with a directory will + include all (non-dot) files in that directory in lexically sorted order + (non-recursive), closes ticket 1922. + - Makes SAVECONF command return error when overwriting a torrc + that has includes. Using SAVECONF with the FORCE option will + allow it to overwrite torrc even if includes are used, closes ticket + 1922. + - Adds config-can-saveconf to GETINFO command to tell if SAVECONF + will work without the FORCE option, closes ticket 1922. |