summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-20 12:58:26 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-20 12:58:26 -0400
commitc57e8da4ea9cccc168bb946040350434088cb7cb (patch)
treeac5709a62d00c82b346ad853bab75df669b8f14e /changes
parentd0009cb8e8bd2a6f1c84f9f117a71f84045fdfce (diff)
parenta3fe8b11663a32f1f007bd7cb0b9656825093544 (diff)
downloadtor-c57e8da4ea9cccc168bb946040350434088cb7cb.tar.gz
tor-c57e8da4ea9cccc168bb946040350434088cb7cb.zip
Merge remote-tracking branch 'public/bug12908_025'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug129084
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.