commit e56263bf20d7011c2f4dfd15e053f22cbd7a5371 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 9 13:47:11 2015 -0400 Fold changes files into changelog for 0.2.6.4-alpha --- ChangeLog | 32 ++++++++++++++++++++++++++++++++ changes/15188 | 3 --- changes/bug15033 | 4 ---- changes/bug15037 | 4 ---- changes/bug15064 | 4 ---- changes/bug15083 | 10 ---------- changes/bug15088 | 4 ---- changes/bug15151 | 3 --- changes/feature15006 | 4 ---- changes/ticket14128 | 5 ----- 10 files changed, 32 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec6322e..64e2140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,34 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? XXXX write a blurb here. + o Major bugfixes (relay, stability, possible security): + - Fix a bug that could lead to a relay crashing with an assertion + failure if a buffer of exactly the wrong layout was passed + to buf_pullup() at exactly the wrong time. Fixes bug 15083; + bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. + - Do not assert if the 'data' pointer on a buffer is advanced to the very + end of the buffer; log a BUG message instead. Only assert if it is + past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + o Major bugfixes (Linux seccomp2 sandbox): - Pass IPPROTO_TCP rather than 0 to socket(), so that the Linux seccomp2 sandbox doesn't fail. Fixes bug 14989; bugfix on 0.2.6.3-alpha. - Allow AF_UNIX hidden services to be used with the seccomp2 sandbox. Fixes bug 15003; bugfix on 0.2.6.3-alpha. + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". + + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, + when "TransProxyType ipfw" is in use. + Fixes bug 15064; bugfix on 0.2.5.4-alpha. + + o Minor features (controller): + - Messages about problems in the bootstrap process now include + information about the server we were trying to connect to when we + noticed the problem. Closes ticket 15006. o Minor features (logs): - Quiet some log messages in the heartbeat and at startup. Closes @@ -25,11 +47,21 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? o Minor bugfixes (compilation): - Fix a compilation warning on s390. Fixes bug 14988; bugfix on 0.2.5.2-alpha. + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. o Minor bugfixes (testing): - Fix endianness issues in unit test for resolve_my_address() to have it pass on big endian systems. Fixes bug 14980; bugfix on Tor 0.2.6.3-alpha. + - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug + 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt. + - When running the new 'make test-stem' target, use the configured + python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch + from "cypherpunks". + - When running the zero-length-keys check, do not use the default + torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported + by "reezer". o Directory authority IP change: - The directory authority Faravahar has a new IP address. This diff --git a/changes/15188 b/changes/15188 deleted file mode 100644 index 2065b39..0000000 --- a/changes/15188 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (testing): - - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug - 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt. diff --git a/changes/bug15033 b/changes/bug15033 deleted file mode 100644 index 953e6c3..0000000 --- a/changes/bug15033 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (tests): - - When running the zero-length-keys check, do not use the default - torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported - by "reezer". diff --git a/changes/bug15037 b/changes/bug15037 deleted file mode 100644 index 587d631..0000000 --- a/changes/bug15037 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - When running the new 'make test-stem' target, use the configured - python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch - from "cypherpunks". diff --git a/changes/bug15064 b/changes/bug15064 deleted file mode 100644 index e6bd747..0000000 --- a/changes/bug15064 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (FreeBSD IPFW transparent proxy): - - Fix address detection with FreeBSD transparent proxies, - when "TransProxyType ipfw" is in use. - Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/changes/bug15083 b/changes/bug15083 deleted file mode 100644 index 5cc79b5..0000000 --- a/changes/bug15083 +++ /dev/null @@ -1,10 +0,0 @@ - o Major bugfixes (relay, stability, possible security): - - Fix a bug that could lead to a relay crashing with an assertion - failure if a buffer of exactly the wrong layout was passed - to buf_pullup() at exactly the wrong time. Fixes bug 15083; - bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - - - Do not assert if the 'data' pointer on a buffer is advanced to the very - end of the buffer; log a BUG message instead. Only assert if it is - past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. - diff --git a/changes/bug15088 b/changes/bug15088 deleted file mode 100644 index 95878bd..0000000 --- a/changes/bug15088 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (Linux seccomp2 sandbox): - - Upon receiving sighup, do not crash during attempts to call - wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from - "sanic". diff --git a/changes/bug15151 b/changes/bug15151 deleted file mode 100644 index b9c3061..0000000 --- a/changes/bug15151 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on - 0.2.6.2-alpha. diff --git a/changes/feature15006 b/changes/feature15006 deleted file mode 100644 index 168a440..0000000 --- a/changes/feature15006 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (controller): - - Messages about problems in the bootstrap process now include - information about the server we were trying to connect to when we - noticed the problem. Closes ticket 15006. diff --git a/changes/ticket14128 b/changes/ticket14128 deleted file mode 100644 index 38b25fa..0000000 --- a/changes/ticket14128 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (controller): - - New "GETINFO bw-event-cache" to get information about recent bandwidth - events. Closes ticket 14128. Useful for controllers to get recent - bandwidth history after the fix for 13988. -