aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-12-15 17:26:09 -0500
committerNick Mathewson <nickm@torproject.org>2009-12-15 17:26:09 -0500
commit350181529e39c5b9dcec7f1ae7edf15946fee501 (patch)
treee6d9f2c537db3f03c0a3d9791b178dae5f1b7782 /ChangeLog
parent616cbb31c72a95408d018fd937f1bf3adf886a9f (diff)
parentfcbd65b45cbf203b00e6752dabc7bc5b8dffdbcf (diff)
downloadtor-350181529e39c5b9dcec7f1ae7edf15946fee501.tar
tor-350181529e39c5b9dcec7f1ae7edf15946fee501.tar.gz
Merge branch 'safelogging2'
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5451e1b8..fe32ab158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Changes in version 0.2.2.7-alpha - 2009-??-??
- New controller command "getinfo config-text". It returns the
contents that Tor would write if you send it a SAVECONF command,
so the controller can write the file to disk itself.
+ - New options for SafeLogging to allow scrubbing only log messages
+ generated while acting as a relay.
o Minor bugfixes:
- Fix compilation on OSX 10.3, which has a stub mlockall() but