commit 301235fb2a9275c09a8cb79c4695c7dfa6057fc6 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 28 09:06:09 2016 -0400
Fold entries into changelog --- ChangeLog | 6 ++++++ changes/bug18626 | 5 ----- changes/bug18651 | 3 --- 3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 8374e86..85a9127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,8 @@ Changes in version 0.2.8.2-alpha - 2016-03-?? - Correctly handle detaching circuits from cmuxes when doing circuit_free_all() on shutdown. Fixes bug 18116; bugfix on 0.2.8.1-alpha. + - Fix an assert-on-exit bug related to counting memory usage + in rephist.c. Fixes bug 18651; bugfix on 0.2.8.1-alpha.
o Major bugfixes (dns proxy mode, crash): - Avoid crashing when running as a DNS proxy. Fixes bug 16248; @@ -149,6 +151,10 @@ Changes in version 0.2.8.2-alpha - 2016-03-?? - Do not link the unit tests against both the testing and non- testing versions of the static libraries. Fixes bug 18490; bugfix on 0.2.7.1-alpha. + - Avoid spurious failures from configure files related + to calling exit(0) in TOR_SEARCH_LIBRARY. + Fixes bug 18625; bugfix on 0.2.0.1-alpha. + Patch from "cypherpunks".
o Minor bugfixes (client): - Count receipt of new microdescriptors as progress towards diff --git a/changes/bug18626 b/changes/bug18626 deleted file mode 100644 index 5c1abff..0000000 --- a/changes/bug18626 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (build): - - Avoid spurious failures from configure files related - to calling exit(0) in TOR_SEARCH_LIBRARY. - Fixes bug 18625; bugfix on 0.2.0.1-alpha. - Patch from "cypherpunks". diff --git a/changes/bug18651 b/changes/bug18651 deleted file mode 100644 index 120a1a5..0000000 --- a/changes/bug18651 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (assert on exit): - - Fix an assert-on-exit bug related to counting memory usage - in rephist.c. Fixes bug 18651; bugfix on 0.2.8.1-alpha.