torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2017-05-19 08:46:13 -04:00
parent d34fa32ece ba3a5f82f1
commit 92d335b3dc
13 changed files with 908 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/feature1922
+11
View File
@@ -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.