diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-18 16:07:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-18 16:07:08 -0500 |
| commit | 63765399eb844adfa877a288e655eb281ac8c988 (patch) | |
| tree | c713bc1e54dc4e69282db2c9b221c26d4e4bb479 /changes | |
| parent | 5aa55a1369dbcb849f1290291c48054f25cdd623 (diff) | |
| parent | ffa4ed8d3dea0ffdde2369b1feb24bc3a9b6c101 (diff) | |
| download | tor-63765399eb844adfa877a288e655eb281ac8c988.tar.gz tor-63765399eb844adfa877a288e655eb281ac8c988.zip | |
Merge remote-tracking branch 'public/ticket13037'
Conflicts:
src/or/config.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/remove-bad-fp | 4 | ||||
| -rw-r--r-- | changes/ticket13037 | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/remove-bad-fp b/changes/remove-bad-fp new file mode 100644 index 0000000000..a07e3ba00c --- /dev/null +++ b/changes/remove-bad-fp @@ -0,0 +1,4 @@ + + o Removed features: + - Remove a test for a long-defunct broken directory server. + diff --git a/changes/ticket13037 b/changes/ticket13037 new file mode 100644 index 0000000000..24c4100454 --- /dev/null +++ b/changes/ticket13037 @@ -0,0 +1,4 @@ + o Minor features (build): + - New --disable-system-torrc compile-time option to prevent Tor from + looking for a system-wide torrc or torrc-defaults tile. Resolves + ticket 13037. |