commit 1f0848e0b6674e8c8f3379440c91428bf550dddb Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 08:00:24 2019 -0400
Fold new entries into 0.4.2.1-alpha changelog --- ChangeLog | 9 +++++++++ changes/ticket31687_1 | 4 ---- changes/ticket31687_2 | 5 ----- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 8bec28b35..d604af54e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -170,6 +170,9 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? Previously, these compilation settings would make the compiler look for functions that didn't exist. Fixes bug 31552; bugfix on 0.4.1.1-alpha. + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha.
o Minor bugfixes (configuration): - Invalid floating-point values in the configuration file are now @@ -208,6 +211,12 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? rather than deleting buffered log lines. Fixes bug 31594; bugfix on 0.2.5.2-alpha.
+ o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): + - When extracting an IPv6 address from a PF-based proxy, verify + that we are actually configured to receive an IPv6 address, + and log an internal error if not. Fixes part of bug 31687; + bugfix on 0.2.3.4-alpha. + o Minor bugfixes (git hooks): - Remove a duplicate call to practracker from the pre-push hook. The pre-push hook already calls the pre-commit hook, which calls diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 deleted file mode 100644 index 2f4d44097..000000000 --- a/changes/ticket31687_1 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - Suppress spurious float-conversion warnings from GCC when calling - floating-point classifier functions on FreeBSD. Fixes part of bug - 31687; bugfix on 0.3.1.5-alpha. diff --git a/changes/ticket31687_2 b/changes/ticket31687_2 deleted file mode 100644 index eadc69827..000000000 --- a/changes/ticket31687_2 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): - - When extracting an IPv6 address from a PF-based proxy, verify - that we are actually configured to receive an IPv6 address, - and log an internal error if not. Fixes part of bug 31687; - bugfix on 0.2.3.4-alpha.