summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-28 11:44:25 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-28 11:44:25 -0400
commit51d14b3d478a94c410a695f736445f42ccc23fb9 (patch)
tree3b3e9e778a51a7dfe66bf4ddfa50af7cde08108b /changes
parent1dd0be75c2119ab5265725641778bf4d77df4d60 (diff)
parent63fc23f8260e2723182fbd8476df78559be325d3 (diff)
downloadtor-51d14b3d478a94c410a695f736445f42ccc23fb9.tar.gz
tor-51d14b3d478a94c410a695f736445f42ccc23fb9.zip
Merge branch 'maint-0.3.1' into release-0.3.1
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.
+