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

[tor/master] Merge remote-tracking branch 'teor/fix-exitpolicy-leak'
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 6102efbee227394ae53727b292a62df5368ab4c6 Merge: 631e351 bb32c29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 16:25:17 2015 -0500 Merge remote-tracking branch 'teor/fix-exitpolicy-leak' src/or/policies.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Initialise configured_addresses to a known value (NULL)
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit bb32c29986ecae6a213254dbfcd5c652caa4102c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Dec 6 20:24:45 2015 +1100 Initialise configured_addresses to a known value (NULL) --- src/or/policies.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/policies.c b/src/or/policies.c index 7f71b0d..2f81942 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1350,7 +1350,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, smartlist_t **result) { exit_policy_parser_cfg_t parser_cfg = 0; - smartlist_t *configured_addresses; + smartlist_t *configured_addresses = NULL; int rv = 0; /* Short-circuit for non-exit relays */

1 0

[tor/master] Fix a memory leak in the exit policy parsing code
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 16bec0dfd9e5cdd0faf99587c2261b148bc58011 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 4 15:47:59 2015 +0100 Fix a memory leak in the exit policy parsing code This memory leak only occurs when the Tor instance is not an exit node. Fixes code introduced in 10a6390deb3c9ff9fbd8078fc812abf6c77ad67f. --- src/or/policies.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/policies.c b/src/or/policies.c index 126ba46..7f71b0d 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1350,7 +1350,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, smartlist_t **result) { exit_policy_parser_cfg_t parser_cfg = 0; - smartlist_t *configured_addresses = smartlist_new(); + smartlist_t *configured_addresses; int rv = 0; /* Short-circuit for non-exit relays */ @@ -1360,6 +1360,8 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, return 0; } + configured_addresses = smartlist_new(); + /* Configure the parser */ if (or_options->IPv6Exit) { parser_cfg |= EXIT_POLICY_IPV6_ENABLED;

1 0

[tor-browser/tor-browser-38.4.0esr-5.0-1] Bug 16863: console.error on new Tor Browser window
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 916624727c1effa1987dff1cc5e37961a9e0e7f5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 9 11:47:08 2015 -0500 Bug 16863: console.error on new Tor Browser window Improve error handling and avoid confusing error log messages when loop.enabled is false. --- browser/components/customizableui/CustomizableUI.jsm | 8 ++++++++ browser/components/customizableui/CustomizableWidgets.jsm | 8 +++----- browser/components/loop/MozLoopService.jsm | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 54c2ede..a43404e 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -1186,6 +1186,11 @@ let CustomizableUIInternal = { throw new Error("buildWidget was passed a non-widget to build."); } + if (aWidget.onIsHidden && aWidget.onIsHidden()) { + LOG("Skipping hidden widget " + aWidget.id + " of type " + aWidget.type); + return undefined; + } + LOG("Building " + aWidget.id + " of type " + aWidget.type); let node; @@ -2180,6 +2185,7 @@ let CustomizableUIInternal = { widget._introducedInVersion = aData.introducedInVersion || 0; } + this.wrapWidgetEventHandler("onIsHidden", widget); this.wrapWidgetEventHandler("onBeforeCreated", widget); this.wrapWidgetEventHandler("onClick", widget); this.wrapWidgetEventHandler("onCreated", widget); @@ -3015,6 +3021,8 @@ this.CustomizableUI = { * of the widget. * - viewId: Only useful for views (and required there): the id of the * <panelview> that should be shown when clicking the widget. + * - onIsHidden(): Called to check whether a widget should be hidden + * (optional; returns a Boolean value). * - onBuild(aDoc): Only useful for custom widgets (and required there); a * function that will be invoked with the document in which * to build a widget. Should return the DOM node that has diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 75f69dd..4a8bacf 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -933,12 +933,10 @@ const CustomizableWidgets = [ // Not in private browsing, see bug 1108187. showInPrivateBrowsing: false, introducedInVersion: 4, + onIsHidden: function() { + return !Services.prefs.getBoolPref("loop.enabled"); + }, onBuild: function(aDocument) { - // If we're not supposed to see the button, return zip. - if (!Services.prefs.getBoolPref("loop.enabled")) { - return null; - } - let node = aDocument.createElementNS(kNSXUL, "toolbarbutton"); node.setAttribute("id", this.id); node.classList.add("toolbarbutton-1"); diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm index 3f6a77c..d915070 100644 --- a/browser/components/loop/MozLoopService.jsm +++ b/browser/components/loop/MozLoopService.jsm @@ -1107,7 +1107,7 @@ this.MozLoopService = { // Don't do anything if loop is not enabled. if (!Services.prefs.getBoolPref("loop.enabled")) { - return Promise.reject(new Error("loop is not enabled")); + return Promise.resolve(); } if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16863: console.error on new Tor Browser window
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit c2ce09f61101f3ac2d16d644d7fb56c035bec9ba Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 9 11:47:08 2015 -0500 Bug 16863: console.error on new Tor Browser window Improve error handling and avoid confusing error log messages when loop.enabled is false. --- browser/components/customizableui/CustomizableUI.jsm | 8 ++++++++ browser/components/customizableui/CustomizableWidgets.jsm | 8 +++----- browser/components/loop/MozLoopService.jsm | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 54c2ede..a43404e 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -1186,6 +1186,11 @@ let CustomizableUIInternal = { throw new Error("buildWidget was passed a non-widget to build."); } + if (aWidget.onIsHidden && aWidget.onIsHidden()) { + LOG("Skipping hidden widget " + aWidget.id + " of type " + aWidget.type); + return undefined; + } + LOG("Building " + aWidget.id + " of type " + aWidget.type); let node; @@ -2180,6 +2185,7 @@ let CustomizableUIInternal = { widget._introducedInVersion = aData.introducedInVersion || 0; } + this.wrapWidgetEventHandler("onIsHidden", widget); this.wrapWidgetEventHandler("onBeforeCreated", widget); this.wrapWidgetEventHandler("onClick", widget); this.wrapWidgetEventHandler("onCreated", widget); @@ -3015,6 +3021,8 @@ this.CustomizableUI = { * of the widget. * - viewId: Only useful for views (and required there): the id of the * <panelview> that should be shown when clicking the widget. + * - onIsHidden(): Called to check whether a widget should be hidden + * (optional; returns a Boolean value). * - onBuild(aDoc): Only useful for custom widgets (and required there); a * function that will be invoked with the document in which * to build a widget. Should return the DOM node that has diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 75f69dd..4a8bacf 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -933,12 +933,10 @@ const CustomizableWidgets = [ // Not in private browsing, see bug 1108187. showInPrivateBrowsing: false, introducedInVersion: 4, + onIsHidden: function() { + return !Services.prefs.getBoolPref("loop.enabled"); + }, onBuild: function(aDocument) { - // If we're not supposed to see the button, return zip. - if (!Services.prefs.getBoolPref("loop.enabled")) { - return null; - } - let node = aDocument.createElementNS(kNSXUL, "toolbarbutton"); node.setAttribute("id", this.id); node.classList.add("toolbarbutton-1"); diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm index 3f6a77c..d915070 100644 --- a/browser/components/loop/MozLoopService.jsm +++ b/browser/components/loop/MozLoopService.jsm @@ -1107,7 +1107,7 @@ this.MozLoopService = { // Don't do anything if loop is not enabled. if (!Services.prefs.getBoolPref("loop.enabled")) { - return Promise.reject(new Error("loop is not enabled")); + return Promise.resolve(); } if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 12516: Compile hardenend Tor Browser with -fwrapv
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 507be1ee78b54b23106d6e99b5d07835d34682a0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 8 10:27:03 2015 +0000 Bug 12516: Compile hardenend Tor Browser with -fwrapv --- .mozconfig-asan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 218d2bd..9472ff2 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -frwapv" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl"

1 0

[tor-browser-bundle/hardened-builds] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit ce9150067e4bdf5699dc22d64bd0b532516d3292 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a055d8f..f27d389 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,7 +20,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[tor-browser-bundle/maint-5.0] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 0e8100faec7ec7bc38cc009f33a13988eabe90aa Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 3aab4c6..4fea91b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -26,7 +26,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[tor-browser-bundle/master] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 52a18422300ce825e0373468084f210aedc368d7 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a055d8f..f27d389 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,7 +20,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit 308d4ef1fe07da148d768ce4704bc7b46440525e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 17:17:12 2015 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- hu/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hu/abouttbupdate.dtd b/hu/abouttbupdate.dtd new file mode 100644 index 0000000..d7f4814 --- /dev/null +++ b/hu/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor Browser Frissítés"> +<!ENTITY aboutTBUpdate.updated "Tor Browser frissítve."> +<!ENTITY aboutTBUpdate.linkPrefix "Az erről a kiadásról szóló legfrissebb információkért"> +<!ENTITY aboutTBUpdate.linkLabel "látogassa meg weboldalunkat"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Változások listája:">

1 0