summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2018-10-17 13:56:41 -0400
committerRoger Dingledine <arma@torproject.org>2018-10-17 13:56:41 -0400
commitdf78a2730cda08bcf4021b84ef301d58ba1f391a (patch)
tree35a8412c15a59812c7e9b120b90602902950dd17 /ChangeLog
parent1a3fbba92bace91588d9548f1dec5e919f97e8c2 (diff)
downloadtor-df78a2730cda08bcf4021b84ef301d58ba1f391a.tar.gz
tor-df78a2730cda08bcf4021b84ef301d58ba1f391a.zip
merge in some fixes i found in a sandbox
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a616660e..df8e57c511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1252,7 +1252,7 @@ Changes in version 0.3.4.6-rc - 2018-08-06
o Minor bugfixes (correctness, flow control):
- Upon receiving a stream-level SENDME cell, verify that our window
has not grown too large. Fixes bug 26214; bugfix on svn
- r54 (pre-0.0.1)
+ r54 (pre-0.0.1).
o Minor bugfixes (memory, correctness):
- Fix a number of small memory leaks identified by coverity. Fixes
@@ -2366,7 +2366,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17
once had an ed25519 key associated with their RSA key to always
have that key, instead of allowing them to drop back to a version
that didn't support ed25519. This means they need to use a new RSA
- key if the want to downgrade to an older version of tor without
+ key if they want to downgrade to an older version of tor without
ed25519. Closes ticket 20522.
o Documentation: