aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-02-25 16:47:52 -0500
committerRoger Dingledine <arma@torproject.org>2014-02-25 16:47:52 -0500
commit8ab7e151dd7d4e09dc67d18748be2b8217236c20 (patch)
tree10b4f1dc3ca282f2b1d0573d1f2f9a52e4146b7b
parent168da9129d3190f396a21ce8dea7e789222c69f1 (diff)
downloadtor-8ab7e151dd7d4e09dc67d18748be2b8217236c20.tar.gz
tor-8ab7e151dd7d4e09dc67d18748be2b8217236c20.zip
fold in the next changes entry
-rw-r--r--ChangeLog6
-rw-r--r--changes/bug108706
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index eab23075e9..ab4e1b450f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,12 @@ Changes in version 0.2.4.21 - 2014-02-2?
since it could also indicate an ENETUNREACH connection error. Fixes
part of bug 10777; bugfix on 0.2.4.8-alpha.
+ o Code simplification and refactoring:
+ - Remove data structures which were introduced to implement the
+ CellStatistics option: they are now redundant with the new timestamp
+ field in the regular packed_cell_t data structure, which we did
+ in 0.2.4.18-rc in order to resolve bug 9093. Resolves ticket 10870.
+
o Minor features:
- Always clear OpenSSL bignums before freeing them -- even bignums
that don't contain secrets. Resolves ticket 10793. Patch by
diff --git a/changes/bug10870 b/changes/bug10870
deleted file mode 100644
index d8a00f4029..0000000000
--- a/changes/bug10870
+++ /dev/null
@@ -1,6 +0,0 @@
- o Code simplification and refactoring:
- - Remove data structures which were introduced to implement the
- CellStatistics option: they are now redundant with the addition
- of timestamp to the regular packed_cell_t data structure, which
- we did in 0.2.4.18-rc in order to resolve #9093. Fixes bug
- 10870. \ No newline at end of file