diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-06-18 12:01:56 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-06-18 12:01:56 -0400 |
commit | 72acdfe13465939150cb61943b23495ec85e9441 (patch) | |
tree | ac7c80b797a370fdbef24ec8ae9b3397ba7d9b2a /changes | |
parent | 4cbd6e46ef6d64e293dd03b0c453a2750684563a (diff) | |
parent | f5e86bcd6c06d43ff3af5acd8135bd8b577bc3fd (diff) | |
download | tor-72acdfe13465939150cb61943b23495ec85e9441.tar.gz tor-72acdfe13465939150cb61943b23495ec85e9441.zip |
Merge branch 'bug4748_squashed'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug4748 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug4748 b/changes/bug4748 new file mode 100644 index 0000000000..9c0f9cff0c --- /dev/null +++ b/changes/bug4748 @@ -0,0 +1,4 @@ + o Documentation: + - Document the --defaults-torrc option, and the new (in 0.2.3) + semantics for overriding, extending, and clearing lists of + options. Closes bug 4748. |