summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-28 11:43:55 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-28 11:43:55 -0400
commitc107aae3c29bb0f62586ffef4c636ae2f47e746b (patch)
tree402d87e7f57102e920f8bf732fbb5fae6d6169c4 /changes
parent4b4b3afb569a40db99c1614bc83d835b0a23fe27 (diff)
parentab166fe68faa87237c767a38682271b22ce8c029 (diff)
downloadtor-c107aae3c29bb0f62586ffef4c636ae2f47e746b.tar.gz
tor-c107aae3c29bb0f62586ffef4c636ae2f47e746b.zip
Merge branch 'ticket22348_031'
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket223485
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket22348 b/changes/ticket22348
new file mode 100644
index 0000000000..49ae94cdf3
--- /dev/null
+++ b/changes/ticket22348
@@ -0,0 +1,5 @@
+ o Minor features (directory authority):
+ - Improve the message that authorities report to relays when
+ the RSA/Ed25519 key pair they present conflicts with a previously
+ pinned key. Closes ticket 22348.
+