aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-22 20:53:04 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-22 20:53:04 -0400
commit915791bc483ca3c8adb63d211afd52b3f98007a9 (patch)
treee7cc512cca7b5b66f03f6c0e642fa2dd9432bcf2 /ChangeLog
parent1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5 (diff)
parentfa21ac1de615e8a2f6f1b9fca3c3db96a9529197 (diff)
downloadtor-915791bc483ca3c8adb63d211afd52b3f98007a9.tar.gz
tor-915791bc483ca3c8adb63d211afd52b3f98007a9.zip
Merge branch 'ticket25024_squashed'
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26707cc055..8789b215d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -964,7 +964,7 @@ Changes in version 0.3.3.2-alpha - 2018-02-10
would call the Rust implementation of
protover_get_supported_protocols(). This was due to the C version
returning a static string, whereas the Rust version newly allocated
- a CString to pass accross the FFI boundary. Consequently, the C
+ a CString to pass across the FFI boundary. Consequently, the C
code was not expecting to need to free() what it was given. Fixes
bug 25127; bugfix on 0.3.2.1-alpha.