commit 8ab7e151dd7d4e09dc67d18748be2b8217236c20 Author: Roger Dingledine <arma@torproject.org> Date: Tue Feb 25 16:47:52 2014 -0500 fold in the next changes entry --- ChangeLog | 6 ++++++ changes/bug10870 | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index eab2307..ab4e1b4 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 d8a00f4..0000000 --- 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