summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-02 16:31:32 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-02 16:31:32 -0500
commitd03e1da232ada2e0d3a3de3dbf6885caec74e4e0 (patch)
treecd3fc872abd2f7fa80af365887a0ea87564199b8 /changes
parent3b96bf68315083f83a5f807ccf6f41feafeeb445 (diff)
parent41ba4f5627326e1745f0eea143f038677170c596 (diff)
downloadtor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.tar.gz
tor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.zip
Merge remote-tracking branch 'public/bug9635_warnings_025'
Conflicts: src/test/test.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug96353
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug9635 b/changes/bug9635
new file mode 100644
index 0000000000..17a2ea5b78
--- /dev/null
+++ b/changes/bug9635
@@ -0,0 +1,3 @@
+ o Downgraded warnings:
+ - Don't warn when we've attempted to contact a relay using the wrong
+ ntor onion key. Closes ticket 9635.