tor-commits October 2016

tor-commits@lists.torproject.org

18 participants
868 discussions

[tor-messenger-build/master] Revert "Add the fixup for trac 20204"
by arlo＠torproject.org 26 Oct '16

26 Oct '16

commit f6a024dfd18f8a49e40e46df161e739fdb43ba24 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 26 12:10:48 2016 -0700 Revert "Add the fixup for trac 20204" * And bump tor-browser to 41f1c54a, now that this patch is upstream. This reverts commit 83d3a565273eb7ddd8dc9cdf5ca1423d2960d9cc. --- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- ...Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- ...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- ...070710-Add-mozilla-ViewRegion-which-assem.patch | 28 ---------------------- projects/mozilla/config | 3 +-- 8 files changed, 7 insertions(+), 36 deletions(-) diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 684e6cf..9fca0b7 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,7 +1,7 @@ From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 -Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP +Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP * Revert "Bug #3875: Use Optimistic Data SOCKS variant." diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 906cb49..8f08ce2 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,7 +1,7 @@ From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 -Subject: [PATCH 2/7] Trac 16475: Block flash too +Subject: [PATCH 2/6] Trac 16475: Block flash too * Builds on "Bug #3547: Block all plugins except flash." --- diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index 3c42635..d903ceb 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,7 +1,7 @@ From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 -Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka +Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka * Bug 1283573 - Don't attempt to look up a single-face-family name if the corresponding main family isn't available. r=mstange diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 9ee103f..81a82c3 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,7 +1,7 @@ From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 -Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 +Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 * We're reverting the patch, "Adjust atomic ops code to be more compatible with thread sanitizer tools." diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index c134bc3..260ab94 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,7 +1,7 @@ From ab2a2be728d371e632d7816f97d399be84034b18 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 -Subject: [PATCH 5/7] OSX: package as tar.bz2 +Subject: [PATCH 5/6] OSX: package as tar.bz2 --- toolkit/mozapps/installer/upload-files.mk | 2 +- diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index a0118a7..742f3f5 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,7 +1,7 @@ From 57faba03c751bd972776027faf84d798d2438e12 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 -Subject: [PATCH 6/7] Updater fixups for TM +Subject: [PATCH 6/6] Updater fixups for TM * Remove updater links diff --git a/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch b/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch deleted file mode 100644 index 15f58e6..0000000 --- a/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 56a75be530e26bf19f730957d10e46b6c6ccf609 Mon Sep 17 00:00:00 2001 -From: Kathy Brade <brade(a)pearlcrescent.com> -Date: Tue, 25 Oct 2016 23:01:20 -0400 -Subject: [PATCH 7/7] fixup! Bug 1070710 - Add mozilla::ViewRegion which - assembles a LayoutDeviceIntRegion as NSViews. r=spohl - -OSX: Fix a problem where clicking and dragging in the content area of a -window would sometimes cause the window to move. This is a fixup for an -error introduced while backporting a Mozilla patch for Tor bug 20204. ---- - widget/cocoa/ViewRegion.mm | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm -index 3459849..ee31889 100644 ---- a/widget/cocoa/ViewRegion.mm -+++ b/widget/cocoa/ViewRegion.mm -@@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, - } - [view setNeedsDisplay:YES]; - mViews.AppendElement(view); -- iter.Next(); - } else { - // Our new region is made of fewer rects than the old region, so we can - // remove this view. We only have a weak reference to it, so removing it --- -2.10.1 - diff --git a/projects/mozilla/config b/projects/mozilla/config index 1d22708..fea12d5 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git -git_hash: 8b1f07f31cd04fb157bf99a9e2e600b4422f277f +git_hash: 41f1c54ad978155f964fca1100f0c2eda1bef88a input_files: - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch - filename: 0002-Trac-16475-Block-flash-too.patch @@ -10,4 +10,3 @@ input_files: - filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch - filename: 0005-OSX-package-as-tar.bz2.patch - filename: 0006-Updater-fixups-for-TM.patch - - filename: 0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl
by gk＠torproject.org 26 Oct '16

26 Oct '16

commit 41f1c54ad978155f964fca1100f0c2eda1bef88a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 25 23:01:20 2016 -0400 fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl OSX: Fix a problem where clicking and dragging in the content area of a window would sometimes cause the window to move. This is a fixup for an error introduced while backporting a Mozilla patch for Tor bug 20204. --- widget/cocoa/ViewRegion.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm index 3459849..ee31889 100644 --- a/widget/cocoa/ViewRegion.mm +++ b/widget/cocoa/ViewRegion.mm @@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, } [view setNeedsDisplay:YES]; mViews.AppendElement(view); - iter.Next(); } else { // Our new region is made of fewer rects than the old region, so we can // remove this view. We only have a weak reference to it, so removing it

1 0

[tor/master] Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR
by nickm＠torproject.org 26 Oct '16

26 Oct '16

commit d28870402376c52b32feaebfcbe190873218fb89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 12:52:34 2016 -0400 Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR The tor_fragile_assert() bug has existed here since c8a5e2d588e0d91 in tor-0.2.1.7-alpha forever, but tor_fragile_assert() was mostly a no-op until 0.2.9.1-alpha. Fixes bug 19869. --- changes/bug19869 | 4 ++++ src/or/dnsserv.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug19869 b/changes/bug19869 new file mode 100644 index 0000000..430048f --- /dev/null +++ b/changes/bug19869 @@ -0,0 +1,4 @@ + o Minor bugfixes (DNSPort): + - On DNSPort, stop logging a BUG warning on a failed hostname lookup. + Fixes bug 19869; bugfix on 0.2.9.1-alpha. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 04be3e8..f5a4f2a 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -290,6 +290,10 @@ evdns_get_orig_address(const struct evdns_server_request *req, case RESOLVED_TYPE_IPV6: type = EVDNS_TYPE_AAAA; break; + case RESOLVED_TYPE_ERROR: + case RESOLVED_TYPE_ERROR_TRANSIENT: + /* Addr doesn't matter, since we're not sending it back in the reply.*/ + return addr; default: tor_fragile_assert(); return addr;

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 26 Oct '16

26 Oct '16

commit 5a1779b7ffa7445005dc271985bae43c6c761dc0 Merge: 8a38d05 d288704 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 14:17:21 2016 -0400 Merge branch 'maint-0.2.9' changes/bug19869 | 4 ++++ src/or/dnsserv.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.9] Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR
by nickm＠torproject.org 26 Oct '16

26 Oct '16

1 0

[tor/maint-0.2.9] Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR
by nickm＠torproject.org 26 Oct '16

26 Oct '16

1 0

[tor/master] Continue the module documentation effort with circuitbuild and circuituse
by nickm＠torproject.org 26 Oct '16

26 Oct '16

commit 8a38d053a09615c8d9009571ba639bfcbd1d4fe2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 13:30:23 2016 -0400 Continue the module documentation effort with circuitbuild and circuituse --- src/or/circuitbuild.c | 14 ++++++++++++++ src/or/circuituse.c | 20 +++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 873d2ec..961c166 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -9,6 +9,20 @@ * * \brief Implements the details of building circuits (by chosing paths, * constructing/sending create/extend cells, and so on). + * + * On the client side, this module handles launching circuits. Circuit + * launches are srtarted from circuit_establish_circuit(), called from + * circuit_launch_by_extend_info()). To choose the path the circuit will + * take, onion_extend_cpath() calls into a maze of node selection functions. + * + * Once the circuit is ready to be launched, the first hop is treated as a + * special case with circuit_handle_first_hop(), since it might need to open a + * channel. As the channel opens, and later as CREATED and RELAY_EXTENDED + * cells arrive, the client will invoke circuit_send_next_onion_skin() to send + * CREATE or RELAY_EXTEND cells. + * + * On the server side, this module also handles the logic of responding to + * RELAY_EXTEND requests, using circuit_extend(). **/ #define CIRCUITBUILD_PRIVATE diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f344703..166971c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -6,7 +6,25 @@ /** * \file circuituse.c - * \brief Launch the right sort of circuits and attach streams to them. + * \brief Launch the right sort of circuits and attach the right streams to + * them. + * + * As distinct from circuitlist.c, which manages lookups to find circuits, and + * circuitbuild.c, which handles the logistics of circuit construction, this + * module keeps track of which streams can be attached to which circuits (in + * circuit_get_best()), and attaches streams to circuits (with + * circuit_try_attaching_streams(), connection_ap_handshake_attach_circuit(), + * and connection_ap_handshake_attach_chosen_circuit(). + * + * This module also makes sure that we are building circuits for all of the + * predicted ports, using circuit_remove_handled_ports(), + * circuit_stream_is_being_handled(), and circuit_build_needed_cirs(). It + * handles launching circuits for specific targets using + * circuit_launch_by_extend_info(). + * + * This is also where we handle expiring circuits that have been around for + * too long without actually completing, along with the circuit_build_timeout + * logic in circuitstats.c. **/ #include "or.h"

1 0

[tor-messenger-build/master] Add the fixup for trac 20204
by arlo＠torproject.org 26 Oct '16

26 Oct '16

commit 83d3a565273eb7ddd8dc9cdf5ca1423d2960d9cc Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 26 10:14:11 2016 -0700 Add the fixup for trac 20204 * Until gk puts in on tor-browser-45.4.0esr-6.0-1 as well. --- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- ...Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- ...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- ...070710-Add-mozilla-ViewRegion-which-assem.patch | 28 ++++++++++++++++++++++ projects/mozilla/config | 1 + 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 9fca0b7..684e6cf 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,7 +1,7 @@ From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 -Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP +Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP * Revert "Bug #3875: Use Optimistic Data SOCKS variant." diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 8f08ce2..906cb49 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,7 +1,7 @@ From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 -Subject: [PATCH 2/6] Trac 16475: Block flash too +Subject: [PATCH 2/7] Trac 16475: Block flash too * Builds on "Bug #3547: Block all plugins except flash." --- diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index d903ceb..3c42635 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,7 +1,7 @@ From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 -Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka +Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka * Bug 1283573 - Don't attempt to look up a single-face-family name if the corresponding main family isn't available. r=mstange diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 81a82c3..9ee103f 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,7 +1,7 @@ From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 -Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 +Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 * We're reverting the patch, "Adjust atomic ops code to be more compatible with thread sanitizer tools." diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 260ab94..c134bc3 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,7 +1,7 @@ From ab2a2be728d371e632d7816f97d399be84034b18 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 -Subject: [PATCH 5/6] OSX: package as tar.bz2 +Subject: [PATCH 5/7] OSX: package as tar.bz2 --- toolkit/mozapps/installer/upload-files.mk | 2 +- diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 742f3f5..a0118a7 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,7 +1,7 @@ From 57faba03c751bd972776027faf84d798d2438e12 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 -Subject: [PATCH 6/6] Updater fixups for TM +Subject: [PATCH 6/7] Updater fixups for TM * Remove updater links diff --git a/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch b/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch new file mode 100644 index 0000000..15f58e6 --- /dev/null +++ b/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch @@ -0,0 +1,28 @@ +From 56a75be530e26bf19f730957d10e46b6c6ccf609 Mon Sep 17 00:00:00 2001 +From: Kathy Brade <brade(a)pearlcrescent.com> +Date: Tue, 25 Oct 2016 23:01:20 -0400 +Subject: [PATCH 7/7] fixup! Bug 1070710 - Add mozilla::ViewRegion which + assembles a LayoutDeviceIntRegion as NSViews. r=spohl + +OSX: Fix a problem where clicking and dragging in the content area of a +window would sometimes cause the window to move. This is a fixup for an +error introduced while backporting a Mozilla patch for Tor bug 20204. +--- + widget/cocoa/ViewRegion.mm | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm +index 3459849..ee31889 100644 +--- a/widget/cocoa/ViewRegion.mm ++++ b/widget/cocoa/ViewRegion.mm +@@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, + } + [view setNeedsDisplay:YES]; + mViews.AppendElement(view); +- iter.Next(); + } else { + // Our new region is made of fewer rects than the old region, so we can + // remove this view. We only have a weak reference to it, so removing it +-- +2.10.1 + diff --git a/projects/mozilla/config b/projects/mozilla/config index e7d220f..1d22708 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -10,3 +10,4 @@ input_files: - filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch - filename: 0005-OSX-package-as-tar.bz2.patch - filename: 0006-Updater-fixups-for-TM.patch + - filename: 0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch

1 0

[tor/master] More module documentation (circpathbias, circuitlist)
by nickm＠torproject.org 26 Oct '16

26 Oct '16

commit 9c8dbcd0d676e9092da75c7bdae75679c9d753e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 12:38:50 2016 -0400 More module documentation (circpathbias, circuitlist) --- src/or/circpathbias.c | 8 ++++++++ src/or/circuitlist.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/entrynodes.h | 9 +++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index 9f93e73..6ee69aa 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -11,6 +11,14 @@ * different tor nodes, in an attempt to detect attacks where * an attacker deliberately causes circuits to fail until the client * choses a path they like. + * + * This code is currently configured in a warning-only mode, though false + * positives appear to be rare in practice. There is also support for + * disabling really bad guards, but it's quite experimental and may have bad + * anonymity effects. + * + * The information here is associated with the entry_guard_t object for + * each guard, and stored persistently in the state file. */ #include "or.h" diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2b3c416..a0988c6 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -7,7 +7,48 @@ /** * \file circuitlist.c * - * \brief Manage the global circuit list, and looking up circuits within it. + * \brief Manage global structures that list and index circuits, and + * look up circuits within them. + * + * One of the most frequent operations in Tor occurs every time that + * a relay cell arrives on a channel. When that happens, we need to + * find which circuit it is associated with, based on the channel and the + * circuit ID in the relay cell. + * + * To handle that, we maintain a global list of circuits, and a hashtable + * mapping [channel,circID] pairs to circuits. Circuits are added to and + * removed from this mapping using circuit_set_p_circid_chan() and + * circuit_set_n_circid_chan(). To look up a circuit from this map, most + * callers should use circuit_get_by_circid_channel(), though + * circuit_get_by_circid_channel_even_if_marked() is appropriate under some + * circumstances. + * + * We also need to allow for the possibility that we have blocked use of a + * circuit ID (because we are waiting to send a DESTROY cell), but the + * circuit is not there any more. For that case, we allow placeholder + * entries in the table, using channel_mark_circid_unusable(). + * + * To efficiently handle a channel that has just opened, we also maintain a + * list of the circuits waiting for channels, so we can attach them as + * needed without iterating through the whole list of circuits, using + * circuit_get_all_pending_on_channel(). + * + * In this module, we also handle the list of circuits that have been + * marked for close elsewhere, and close them as needed. (We use this + * "mark now, close later" pattern here and elsewhere to avoid + * unpredictable recursion if we closed every circuit immediately upon + * realizing it needed to close.) See circuit_mark_for_close() for the + * mark function, and circuit_close_all_marked() for the close function. + * + * For hidden services, we need to be able to look up introduction point + * circuits and rendezvous circuits by cookie, key, etc. These are + * currently handled with linear searches in + * circuit_get_ready_rend_circuit_by_rend_data(), + * circuit_get_next_by_pk_and_purpose(), and with hash lookups in + * circuit_get_rendezvous() and circuit_get_intro_point(). + * + * This module is also the entry point for our out-of-memory handler + * logic, which was originally circuit-focused. **/ #define CIRCUITLIST_PRIVATE #include "or.h" @@ -1539,6 +1580,14 @@ circuit_set_intro_point_digest(or_circuit_t *circ, const uint8_t *digest) * cannibalize. * * If !CIRCLAUNCH_NEED_UPTIME, prefer returning non-uptime circuits. + * + * To "cannibalize" a circuit means to extend it an extra hop, and use it + * for some other purpose than we had originally intended. We do this when + * we want to perform some low-bandwidth task at a specific relay, and we + * would like the circuit to complete as soon as possible. (If we were going + * to use a lot of bandwidth, we wouldn't want a circuit with an extra hop. + * If we didn't care about circuit completion latency, we would just build + * a new circuit.) */ origin_circuit_t * circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index eb2fbf7..00f9691 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -56,6 +56,14 @@ typedef struct entry_guard_t { time_t last_attempted; /**< 0 if we can connect to this guard, or the time * at which we last failed to connect to it. */ + /** + * @name circpathbias fields + * + * These fields are used in circpathbias.c to try to detect entry + * nodes that are failing circuits at a suspicious frequency. + */ + /**@{*/ + double circ_attempts; /**< Number of circuits this guard has "attempted" */ double circ_successes; /**< Number of successfully built circuits using * this guard as first hop. */ @@ -71,6 +79,7 @@ typedef struct entry_guard_t { double use_attempts; /**< Number of circuits we tried to use with streams */ double use_successes; /**< Number of successfully used circuits using * this guard as first hop. */ + /**@}*/ } entry_guard_t; entry_guard_t *entry_guard_get_by_id_digest_for_guard_selection(

1 0

[nyx/master] Let users disable on-disk caching
by atagar＠torproject.org 26 Oct '16

26 Oct '16

commit 774ed43694a0130c55b750fad581532c55d44364 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 22 12:16:15 2016 -0700 Let users disable on-disk caching Some users may not want us to cache information to disk. Including a nyxrc option to disable this. Also shortening these option names. Plan is for user-facing nyxrc options to be short, while internal options use namespacing. --- nyx/__init__.py | 7 ++++++- nyx/arguments.py | 4 ++-- nyx/panel/config.py | 28 +++++++++++++++------------- nyx/panel/log.py | 4 ++-- nyx/starter.py | 2 +- nyxrc.sample | 12 +++++++++--- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 75dde99..a66c95b 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -85,7 +85,6 @@ CONFIG = stem.util.conf.config_dict('nyx', { NYX_INTERFACE = None TOR_CONTROLLER = None BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-1]) -DEFAULT_DATA_DIR = os.path.expanduser('~/.nyx') TESTING = False # technically can change but we use this query a *lot* so needs to be cached @@ -238,6 +237,12 @@ def init_controller(*args, **kwargs): @uses_settings +def data_directory(config): + path = config.get('data_directory', '~/.nyx') + return None if path == 'disabled' else os.path.expanduser(path) + + +@uses_settings def expand_path(path, config): """ Expands relative paths and include our chroot if one was set. diff --git a/nyx/arguments.py b/nyx/arguments.py index 9b53e35..efb95ee 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -14,7 +14,7 @@ import nyx.log import stem.util.connection -from nyx import DEFAULT_DATA_DIR, msg +from nyx import msg DEFAULT_ARGS = { 'control_address': '127.0.0.1', @@ -22,7 +22,7 @@ DEFAULT_ARGS = { 'user_provided_port': False, 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, - 'config': os.path.join(DEFAULT_DATA_DIR, 'nyxrc'), + 'config': os.path.join(os.path.expanduser('~/.nyx'), 'nyxrc'), 'debug_path': None, 'logged_events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', 'print_version': False, diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 8390ac5..0f454f3 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -19,7 +19,7 @@ import stem.util.connection from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu -from nyx import DEFAULT_DATA_DIR, tor_controller, input_prompt, show_message +from nyx import tor_controller, data_directory, input_prompt, show_message from stem.util import conf, enum, log, str_tools @@ -41,7 +41,6 @@ CONFIG = conf.config_dict('nyx', { 'features.config.order': [SortAttr.MAN_PAGE_ENTRY, SortAttr.NAME, SortAttr.IS_SET], 'features.config.state.showPrivateOptions': False, 'features.config.state.showVirtualOptions': False, - 'startup.data_directory': DEFAULT_DATA_DIR, }, conf_handler) @@ -131,21 +130,24 @@ class ConfigPanel(nyx.panel.Panel): self._sort_order = CONFIG['features.config.order'] self._show_all = False # show all options, or just the important ones - cached_manual_path = os.path.join(CONFIG['startup.data_directory'], 'manual') + data_dir = data_directory() - if os.path.exists(cached_manual_path): - manual = stem.manual.Manual.from_cache(cached_manual_path) - else: - try: - manual = stem.manual.Manual.from_man() + if data_dir: + cached_manual_path = os.path.join(data_dir, 'manual') + if os.path.exists(cached_manual_path): + manual = stem.manual.Manual.from_cache(cached_manual_path) + else: try: - manual.save(cached_manual_path) + manual = stem.manual.Manual.from_man() + + try: + manual.save(cached_manual_path) + except IOError as exc: + log.debug("Unable to cache manual information to '%s'. This is fine, but means starting Nyx takes a little longer than usual: " % (cached_manual_path, exc)) except IOError as exc: - log.debug("Unable to cache manual information to '%s'. This is fine, but means starting Nyx takes a little longer than usual: " % (cached_manual_path, exc)) - except IOError as exc: - log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) - manual = stem.manual.Manual.from_cache() + log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) + manual = stem.manual.Manual.from_cache() try: for line in tor_controller().get_info('config/names').splitlines(): diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 10e2645..6e1d14d 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -40,7 +40,7 @@ CONFIG = conf.config_dict('nyx', { 'features.log.prepopulate': True, 'features.log.prepopulateReadLimit': 5000, 'features.log.regex': [], - 'startup.events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', + 'logged_events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', }, conf_handler) UPDATE_RATE = 0.3 @@ -69,7 +69,7 @@ class LogPanel(nyx.panel.DaemonPanel): def __init__(self): nyx.panel.DaemonPanel.__init__(self, UPDATE_RATE) - logged_events = CONFIG['startup.events'].split(',') + logged_events = CONFIG['logged_events'].split(',') tor_events = tor_controller().get_info('events/names', '').split() invalid_events = list(filter(lambda event: not event.startswith('NYX_') and event not in tor_events, logged_events)) diff --git a/nyx/starter.py b/nyx/starter.py index dbb6d8c..d23e157 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -32,7 +32,7 @@ def main(config): try: args = nyx.arguments.parse(sys.argv[1:]) - config.set('startup.events', args.logged_events) + config.set('logged_events', args.logged_events) except ValueError as exc: print(exc) sys.exit(1) diff --git a/nyxrc.sample b/nyxrc.sample index c9ff604..bbce437 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -1,6 +1,12 @@ -# Startup options -startup.events N3 -startup.dataDirectory ~/.nyx +# Events that are shown by default in the log. You can also set these with +# 'nyx --log <events>'. + +logged_events NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR + +# Location where information is cached. You can disable caching by setting this +# to 'disabled'. + +data_directory ~/.nyx # Seconds between querying information

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
87
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2016