summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-22 09:19:28 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-22 09:19:28 -0400
commite94ef30a2fa6ef0197fe9fafbb2469475d868627 (patch)
treeb6ff0db12c54fe874a640d439a9d508d00bad31c /changes
parent2a9650625f5ce2cbad67299ce57c92bc70677a9b (diff)
parentd70b1b4da13d30f16ba0604103a1ebe915a2a20a (diff)
downloadtor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.tar.gz
tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.zip
Merge branch 'feature16944_v2'
Diffstat (limited to 'changes')
-rw-r--r--changes/feature169445
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/feature16944 b/changes/feature16944
new file mode 100644
index 0000000000..1728beff7f
--- /dev/null
+++ b/changes/feature16944
@@ -0,0 +1,5 @@
+ o Minor features (relay, ed25519):
+ - Add a new OfflineMasterKey option to tell Tor never to try
+ loading or generating a secret ed25519 identity key. You can use
+ this in combination with tor --keygen to manage offline and/or
+ encrypted ed25519 keys. Implements ticket 16944.