diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-09-10 22:12:47 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-09-10 22:12:47 -0400 |
commit | a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 (patch) | |
tree | 12f0900fd451189aee10b9fcd36469b7bdb08ead /changes | |
parent | 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 (diff) | |
parent | a3fe8b11663a32f1f007bd7cb0b9656825093544 (diff) | |
download | tor-a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411.tar.gz tor-a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411.zip |
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug12908 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug12908 b/changes/bug12908 new file mode 100644 index 0000000000..bd6784cbd2 --- /dev/null +++ b/changes/bug12908 @@ -0,0 +1,4 @@ + o Minor features: + - Warn about attempts to run hidden services and relays in the + same process: that's probably not a good idea. Closes ticket + 12908. |