aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-22 12:27:50 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-22 12:27:50 -0500
commit74e41155ffc3e295322904b5c85179db538d91f8 (patch)
tree50fe27fb56c41765b338560066a51ceaec2e1650
parent21dd3ece620f4790b9431a2dffbc5df66b4fd251 (diff)
parentd9fde87607aa11a9d542f91cd0fa352ea989174f (diff)
downloadtor-74e41155ffc3e295322904b5c85179db538d91f8.tar.gz
tor-74e41155ffc3e295322904b5c85179db538d91f8.zip
Merge branch 'maint-0.3.5'
-rw-r--r--changes/bug290422
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/bug29042 b/changes/bug29042
index ecbcdeeec0..8d76939cea 100644
--- a/changes/bug29042
+++ b/changes/bug29042
@@ -2,4 +2,4 @@
- Log more information at "warning" level when unable to read a private
key; log more information ad "info" level when unable to read a public
key. We had warnings here before, but they were lost during our
- NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha.
+ NSS work. Fixes bug 29042; bugfix on 0.3.5.1-alpha.