March 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit e573a519168d3746d429d27702e6e8a46e56411a Merge: 6bf06c5 9063f29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:52:10 2015 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.2.5] Another entry for the 0.2.5.11 changelog
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 8ba0ea441940f42e192066bc081f3e637b99d2d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:53:06 2015 -0400 Another entry for the 0.2.5.11 changelog --- ChangeLog | 5 +++++ changes/bug15205 | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index caf1f4d..c3fa504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ Changes in version 0.2.5.11 - 2015-03-?? - The directory authority Faravahar has a new IP address. This closes ticket 14487. + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug in + OSX's _strlcat_chk() function. Fixes bug 15205; bug first appeared + in OSX 10.9. + 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 diff --git a/changes/bug15205 b/changes/bug15205 deleted file mode 100644 index 0cb9f3f..0000000 --- a/changes/bug15205 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (crash, OSX, security): - - Fix a remote denial-of-service opportunity caused by a bug - in OSX's _strlcat_chk() function. Fixes bug 15205; bug first - appeared in OSX 10.9. -

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit c2dcd9b703b494b404200c6330ef9f0511b79925 Merge: 8a060d8 9063f29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:50:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ("-s ours" merge to avoid taking reversion of #15064)

1 0

[tor/maint-0.2.6] Revert "Make TransProxyType ipfw work correctly"
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 9063f29160615b379f907009e7158f1fcf1ed84c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:49:08 2015 -0400 Revert "Make TransProxyType ipfw work correctly" This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.) --- changes/bug15064 | 4 ---- src/or/connection_edge.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) 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/src/or/connection_edge.c b/src/or/connection_edge.c index 1eeb22f..49f9ba4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,8 +1531,7 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT || - options->TransProxyType_parsed == TPT_IPFW) + if (options->TransProxyType_parsed == TPT_DEFAULT) return destination_from_pf(conn, req); (void)conn;

1 0

[tor/maint-0.2.5] Revert "Make TransProxyType ipfw work correctly"
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 9063f29160615b379f907009e7158f1fcf1ed84c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:49:08 2015 -0400 Revert "Make TransProxyType ipfw work correctly" This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.) --- changes/bug15064 | 4 ---- src/or/connection_edge.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) 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/src/or/connection_edge.c b/src/or/connection_edge.c index 1eeb22f..49f9ba4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,8 +1531,7 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT || - options->TransProxyType_parsed == TPT_IPFW) + if (options->TransProxyType_parsed == TPT_DEFAULT) return destination_from_pf(conn, req); (void)conn;

1 0

[doctor/master] Proper suppression for 'bandwidth auths differ' message
by atagar＠torproject.org 12 Mar '15

12 Mar '15

commit 0191388312af47960f48c6a14c153b8795cdc5c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 12 09:41:26 2015 -0700 Proper suppression for 'bandwidth auths differ' message Suppression doesn't work for messages with highly dynamic content, so slipping in a hack to ignore those bits. With this suppression will work for messages like... NOTICE: Bandwidth authorities have a substantially different number of measured entries: gabelmoo (7063), tor26 (7056), moria1 (7183), longclaw (5214) --- consensus_health_checker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index b807497..2e15720 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -132,6 +132,11 @@ class Issue(object): attr.update({'unmeasured': 0, 'total': 0, 'percentage': 0}) return CONFIG['msg'][self._template].format(**attr).replace(' ', '_') + elif self._template == 'BANDWIDTH_AUTHORITIES_OUT_OF_SYNC': + attr = dict(self._attr) + attr.update({'authorities': ''}) + + return CONFIG['msg'][self._template].format(**attr).replace(' ', '_') else: return self.get_message().replace(' ', '_')

1 0

[tor/master] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:25 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36 Merge: 1a1d431 eecd410 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:42 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 689562ab481f501951c310672e09b944c2267953 Merge: b683b9a 8a060d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:54 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:25 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)

1 0