tbb-commits

tbb-commits@lists.torproject.org

1 participants
18327 discussions

[tor-browser-bundle/master] Install argparse in windows pluggable-transports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit e68a2db0e6753f3d1d6839c17b88ba987c1c8f14 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 2 04:25:52 2014 +0000 Install argparse in windows pluggable-transports. coderman on IRC noticed that the building of obfsproxy in the windows pluggable transports descriptor was downloading argparse: Processing dependencies for obfsproxy==unknown Searching for argparse Reading https://pypi.python.org/simple/argparse/ Application tried … [View More]to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. err:systray:initialize_systray Could not create tray window fixme:toolhelp:CreateToolhelp32Snapshot Unimplemented: heap list snapshot fixme:toolhelp:Heap32ListFirst : stub Best match: argparse 1.2.1 Downloading http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz#md5=2fbef8cb61e5… Processing argparse-1.2.1.tar.gz argparse was already being installed in the linux and mac descriptors. It was not needed in the windows descriptor, because the windows build uses Python 2.7, and Python 2.7 has argparse in the standard library; and the "py2exe" target was able to find the standard module. However commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 changed obfsproxy to additionally call the "install" target (so that fteproxy could use obfsproxy), and apparently "install" can't find argparse. (Maybe because it's a .py file instead of a directory or an egg?) --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 48efba5..9b0e8ec 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,6 +31,7 @@ files: - "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" +- "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -156,6 +157,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf argparse.tar.gz + cd argparse-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" [View Less]

1 0

[tor-launcher/master] Remove passive voice from progress bar description.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 37adb31f73235869a278d84249087983fedb6575 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 15:09:14 2014 -0700 Remove passive voice from progress bar description. Also make it less confusing. We're making just "a" connection, not a new "network connection" or virtual network interface. --- src/chrome/locale/en/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/… [View More]

1 0

[tor-launcher/master] Bug #10418: Increase dialog height; fix typo.
by brade＠torproject.org 11 Mar '14

11 Mar '14

commit 60c933d5e260303a32df3417332357c2950f439b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 11 15:36:14 2014 -0400 Bug #10418: Increase dialog height; fix typo. --- src/chrome/content/network-settings-overlay.xul | 2 +- src/chrome/skin/network-settings.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index dc88655..… [View More]

1 0

[tor-launcher/master] Generalize Tor Browser strings to be independent of app.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit a634ce616ddc88745c9da0447e055e693ca8523c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 11:07:37 2014 -0700 Generalize Tor Browser strings to be independent of app. We want to allow Tor Launcher to work in Tor Browser, Tails, Thunderbird, and Instantbird with minimal modifications. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/progress.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) … [View More]

1 0

[tor-launcher/master] Change "default bridges" to "provided bridges" everywhere.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 280646446dd3844185d30d1f9586070af19ff95f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 23:18:32 2014 -0700 Change "default bridges" to "provided bridges" everywhere. Sorry translation team, but it is better to do this now than later. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/torlauncher.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/network-… [View More]settings.dtd b/src/chrome/locale/en/network-settings.dtd index 62afab4..a779d9a 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -55,7 +55,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 38d314a..a2550db 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recommended) [View Less]

1 0

[tor-launcher/master] Bug 10418: Improve layout and strings
by mikeperry＠torproject.org 10 Mar '14

10 Mar '14

commit 8748fdb1006a811eb5864be36108be4f2b5d0a8a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 16:27:11 2014 -0700 Bug 10418: Improve layout and strings The layout may still need some work, but at least these strings are in better shape in terms of usability and future changes like #11071. --- src/chrome/content/network-settings-overlay.xul | 23 +++++++++++++---------- src/chrome/locale/en/network-settings.dtd | 9 +++++---- 2 files … [View More]changed, 18 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 29c3bb3..dc88655 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -76,25 +76,28 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <hbox align="center"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <hbox align="baseline"> + <spacer style="width: 1.9em" /> + <label value="&torsettings.useBridges.type;" + control="firewallAllowedPorts"/> + <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> - <radio id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" + <hbox align="baseline" flex="1"> + <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" oncommand="onCustomBridges()" /> + <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> + </hbox> </radiogroup> - <vbox pack="start"> - <button dlgtype="help" oncommand="onOpenHelp()" /> - </vbox> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4e21541..62afab4 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Browser Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> @@ -46,8 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use default bridges of type"> -<!ENTITY torsettings.useBridges.custom "Use custom bridges"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> [View Less]

1 0

[tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
by brade＠torproject.org 10 Mar '14

10 Mar '14

commit 848d698d8c832a88c5c0bc26d87a786cf6f4b6c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 10 14:35:59 2014 -0400 Bug #10418: Use Sentence case for radio button labels. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dca8d53..4e21541 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/… [View More]

1 0

[tor-browser-bundle/master] Bug 4261: Fix DMG permissions to work from /Applications
by mikeperry＠torproject.org 08 Mar '14

08 Mar '14

commit fb9453c51306ad39d261617e2cb3ba8e18368574 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 8 13:46:23 2014 -0800 Bug 4261: Fix DMG permissions to work from /Applications Only seems to matter on some Mac versions... Very odd. --- gitian/build-helpers/ddmg.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index 468d6be..c37a1fd 100755 --- a/gitian/build-… [View More]

1 0

[tor-browser-bundle/master] Add a changelog entry for 3.6-beta-1.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f0fa0845fd19cdba5c1cdc2751d1fbe4e682684e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:27:25 2014 -0800 Add a changelog entry for 3.6-beta-1. --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 657db38..ccf31b0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor … [View More]

1 0

[tor-browser-bundle/master] Update tags for Torbutton and Tor Browser.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit ffd28013c92b64a73ba985b708f47aa30e450063 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:52:06 2014 -0800 Update tags for Torbutton and Tor Browser. --- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7f367a0..4f1d1c8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits