commit 9e7cd76e4cb7508680942e7ad86cd9bb57efc8ce Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 5 12:52:30 2019 -0500

Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687 --- ChangeLog | 6 ++++++ ReleaseNotes | 6 ++++++ 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog index 1f23fa1cf..24fbb0b16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -327,6 +327,12 @@ Changes in version 0.4.1.6 - 2019-09-19 arguments. Previously, it required two or more arguments, and ignored the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.

+ o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 0.4.2.1-alpha): + - 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 (guards, backport from 0.4.2.1-alpha): - When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to diff --git a/ReleaseNotes b/ReleaseNotes index ad24efd60..aeeb383ba 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -42,6 +42,12 @@ Changes in version 0.4.1.6 - 2019-09-19 arguments. Previously, it required two or more arguments, and ignored the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.

+ o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 0.4.2.1-alpha): + - 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 (guards, backport from 0.4.2.1-alpha): - When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to