November 2011 - tor-commits - lists.torproject.org

[orbot/master] don't transproxy orweb
by n8fr8＠torproject.org 13 Nov '11

13 Nov '11

commit 2a92b72941dae3d69237f8d520ddb45bdc3e8824 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Nov 13 10:39:24 2011 -0500 don't transproxy orweb --- .../android/service/TorServiceConstants.java | 1 + .../torproject/android/service/TorTransProxy.java | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index e47ed71..b06565e 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -6,6 +6,7 @@ public interface TorServiceConstants { public final static String TOR_APP_USERNAME = "org.torproject.android"; + public final static String ORWEB_APP_USERNAME = "info.guardianproject.browser"; //home directory of Android application diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 2c1119a..73dac7c 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -192,6 +192,12 @@ public class TorTransProxy implements TorServiceConstants { continue; } + if (apps[i].getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME)) + { + //should never trans proxy the Orbot app (and Tor or Privoxy) itself + continue; + } + TorService.logMessage("enabling transproxy for app: " + apps[i].getUsername() + "(" + apps[i].getUid() + ")"); //TCP

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 13 Nov '11

13 Nov '11

commit 58b65d0422911538b2f280de95bf7d73da5898d0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Nov 13 11:37:14 2011 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b7af10..004907f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC4" android:versionCode="20"> + package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-FINAL" android:versionCode="21"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[tor-cloud/master] No need to chmod the file twice
by runa＠torproject.org 13 Nov '11

13 Nov '11

commit b150132c8fbfcbf3145fcb07ecce2488a0de36c1 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sun Nov 13 11:40:37 2011 +0000 No need to chmod the file twice --- build.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 1d34eb5..29efa20 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,6 @@ export EC2_PRIVATE_KEY=/path/to/pk.cert export EC2_CERT=/path/to/cert.pem - relaytype=$1; region=$2; sshkey=$3; @@ -43,7 +42,6 @@ else exit fi - # get the associated AMI (amazon image) and AKI (amazon kernel) values for # the defined region & architecture. We only work with EBS instance types, as they are # elastic and easy to snapshot @@ -100,7 +98,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} u ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/ec2-prep.sh -O /mnt/src/etc/ec2-prep.sh" # fix permissions -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo chmod +x /mnt/src/etc/ec2-prep.sh && sudo chmod +x /mnt/src/etc/ec2-prep.sh" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo chmod +x /mnt/src/etc/ec2-prep.sh" # rsync the retrieved Ubuntu image to mounted Volume ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo rsync -aXHAS /mnt/src/ /mnt/target"

1 0

[tor-cloud/master] Destroy the ec2-prep script before we reboot, solves #4450
by runa＠torproject.org 13 Nov '11

13 Nov '11

commit 6651d494d1522c722015b1ca224f37d5a398e817 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sun Nov 13 11:42:03 2011 +0000 Destroy the ec2-prep script before we reboot, solves #4450 --- ec2-prep.sh | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 8a436c4..de985cd 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -21,6 +21,11 @@ echo "root required; re-run with sudo"; exit 1; fi +# Get the latest package updates +echo "Updating the system..." +aptitude update +aptitude -y safe-upgrade + # Configure unattended-upgrades. The system will automatically download, # install and configure all packages, and reboot if necessary. echo "Configuring the unattended-upgrades package..." @@ -44,7 +49,7 @@ EOF cat << EOF > $UNATTENDED_UPGRADES // Automatically upgrade packages from these (origin, archive) pairs Unattended-Upgrade::Allowed-Origins { - "Ubuntu lucid"; + "Ubuntu lucid"; "Ubuntu lucid-security"; "Ubuntu lucid-updates"; "Tor lucid"; @@ -109,9 +114,8 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - # Install Tor echo "Installing Tor..."; -aptitude safe-upgrade -y -apt-get -y update -apt-get -y install tor tor-geoipdb +aptitude update +aptitude -y install tor tor-geoipdb # Configure Tor echo "Configuring Tor..."; @@ -184,10 +188,8 @@ fi # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -echo "Restarting Tor..."; -/etc/init.d/tor restart -update-rc.d tor enable - +# # We're done; tell the user and then reboot the system echo "Done configuring the system, will reboot" +echo "Your system has been configured as a Tor bridge, see https://cloud.torproject.org/ for more info" > /etc/ec2-prep.sh reboot

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 13 Nov '11

13 Nov '11

commit ff63bb36f469570015a8f700c57207b0e647445c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 13 04:15:09 2011 +0000 Update translations for orbot --- values-ar/strings.xml | 16 ++++++++++++++++ values-ca/strings.xml | 16 ++++++++++++++++ values-de/strings.xml | 16 ++++++++++++++++ values-es/strings.xml | 16 ++++++++++++++++ values-fa/strings.xml | 16 ++++++++++++++++ values-fr/strings.xml | 16 ++++++++++++++++ values-hu/strings.xml | 16 ++++++++++++++++ values-it/strings.xml | 16 ++++++++++++++++ values-mk/strings.xml | 16 ++++++++++++++++ values-nb/strings.xml | 16 ++++++++++++++++ values-nl/strings.xml | 16 ++++++++++++++++ values-pl/strings.xml | 16 ++++++++++++++++ values-pt/strings.xml | 16 ++++++++++++++++ values-ru/strings.xml | 16 ++++++++++++++++ values-sv/strings.xml | 16 ++++++++++++++++ values-zh/strings.xml | 16 ++++++++++++++++ values/strings.xml | 16 ++++++++++++++++ 17 files changed, 272 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 3135a88..5962d9c 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -129,4 +129,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index f3978dc..f66ef3f 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -129,4 +129,20 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index b1b498f..a8c9537 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -130,4 +130,20 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_proxy_port_title">Proxy Port</string> <string name="pref_proxy_port_summary">Proxy Server Port</string> <string name="pref_proxy_port_dialog">Proxy Port eingeben</string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index f294f8a..47d4760 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -129,4 +129,20 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 2b1d469..026c0c9 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -119,4 +119,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 82531a4..4240f0c 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 6ed5ff8..d59c11d 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index eadd004..1474ad0 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -124,4 +124,20 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 2872d70..4ac3b87 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 7124442..2a75072 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -119,4 +119,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 641e9d3..2d43e72 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -128,4 +128,20 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 00a56ae..5b57bb2 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index cc923f4..625b14a 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -119,4 +119,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 9ff44bf..c4e788f 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 0012721..15f4bb8 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -119,4 +119,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index ca04f4f..d72d1f0 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -122,4 +122,20 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index dad3146..679e13e 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -123,4 +123,20 @@ <string name="pref_proxy_port_title">Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> + <string name="status">Status</string> + <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> + <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> + <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> + <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> + <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> + <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> + <string name="bridge_error">Bridge Error</string> + <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> + <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> </resources>

1 0

r25210: {website} revert the customizations to makefile, remove the old javasc (website/trunk)
by Andrew Lewman 13 Nov '11

13 Nov '11

Author: phobos Date: 2011-11-13 02:35:57 +0000 (Sun, 13 Nov 2011) New Revision: 25210 Removed: website/trunk/jquery.infieldlabel.min.js website/trunk/jquery.min.js Modified: website/trunk/Makefile Log: revert the customizations to makefile, remove the old javascript. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-11-13 00:37:12 UTC (rev 25209) +++ website/trunk/Makefile 2011-11-13 02:35:57 UTC (rev 25210) @@ -2,7 +2,7 @@ # # 1. Clone the Tor git repository and make TORGIT point to it: # -# git clone git://git.torproject.org/tor/ tor +# git clone git://git.torproject.org/tor/ tor.git # # Note that you will need to point to the actual .git directory. # 2. Edit include/versions.wmi or others if you like @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/runa/tordev/tor/.git +export TORGIT=set this to your tor.git path export STABLETAG=tor-0.2.2.34 export DEVTAG=tor-0.2.3.7-alpha Deleted: website/trunk/jquery.infieldlabel.min.js =================================================================== (Binary files differ) Deleted: website/trunk/jquery.min.js =================================================================== (Binary files differ)

1 0

r25209: {website} offer a 64-bit linux link if the page mis-guesses your OS he (website/trunk/download/en)
by Roger Dingledine 13 Nov '11

13 Nov '11

Author: arma Date: 2011-11-13 00:37:12 +0000 (Sun, 13 Nov 2011) New Revision: 25209 Modified: website/trunk/download/en/download-easy.wml Log: offer a 64-bit linux link if the page mis-guesses your OS help #4232 Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-11-13 00:36:26 UTC (rev 25208) +++ website/trunk/download/en/download-easy.wml 2011-11-13 00:37:12 UTC (rev 25209) @@ -49,49 +49,49 @@ <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> + <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p> </div> </div>  <div class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> <h2>Tor Browser Bundle for Mac</h2> - <em>Version <version-torbrowserbundleosx> - OS X</em> + <em>Version <version-torbrowserbundleosx32> - OS X</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> + <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p> </div> </div>  <div class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> <h2>Tor Browser Bundle for 64-Bit Mac</h2> - <em>Version <version-torbrowserbundleosx> - OS X (64-Bit)</em> + <em>Version <version-torbrowserbundleosx64> - OS X (64-Bit)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Mac? Download for <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux</a></p> + <p class="alt-dl">Not Using Mac? Download for <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p> </div> </div>  @@ -112,7 +112,7 @@ <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div>  @@ -133,7 +133,7 @@ <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div> <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>

1 0

r25208: {website} break version-torbrowserbundleosx into 32 and 64, so in the (in website/trunk: download/en include projects/en)
by Roger Dingledine 13 Nov '11

13 Nov '11

Author: arma Date: 2011-11-13 00:36:26 +0000 (Sun, 13 Nov 2011) New Revision: 25208 Modified: website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: break version-torbrowserbundleosx into 32 and 64, so in the future helix can version them separately if she needs to Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/download/en/download.wml 2011-11-13 00:36:26 UTC (rev 25208) @@ -136,27 +136,27 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a href="<page projects/torbrowser-details>#build">Source Code</a> </form> <h2>Tor Browser Bundle</h2> - <em>Version <version-torbrowserbundleosx> - OS X Intel</em> + <em>Version <version-torbrowserbundleosx32> - OS X Intel</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div>  Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/include/dlhead.wmi 2011-11-13 00:36:26 UTC (rev 25208) @@ -60,8 +60,8 @@ var pkg = caller.attr('id'); var lang = caller.val(); var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; - var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-'+lang+'.zip'; + var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-'+lang+'.zip'; + var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-'+lang+'.zip'; var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; if(pkg == 'win-tbb'){ Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/include/versions.wmi 2011-11-13 00:36:26 UTC (rev 25208) @@ -45,7 +45,8 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.34-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/projects/en/torbrowser.wml 2011-11-13 00:36:26 UTC (rev 25208) @@ -94,77 +94,77 @@ </p> <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox (version -<version-torbrowserbundleosx>, 28 MB)</p> +<version-torbrowserbundleosx32>, 28 MB)</p> <ul> - <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) | - <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-en-US.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) | + <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-en-US.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ar.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ar.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-de.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-de.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>) + <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-es-ES.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-es-ES.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>) + <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fa.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fa.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>) + <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fr.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fr.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>) + <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-it.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-it.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>) + <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-nl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-nl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>) + <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) + <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pt-PT.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pt-PT.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>) + <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ru.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ru.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>) </li> - <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">32-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) | -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip">64-bit</a> - (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) + <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-zh-CN.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-zh-CN.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) </li> </ul>

1 0

r25207: {website} make it much more obvious that the torbutton page isn't for (website/trunk/torbutton/en)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 22:39:58 +0000 (Sat, 12 Nov 2011) New Revision: 25207 Modified: website/trunk/torbutton/en/index.wml Log: make it much more obvious that the torbutton page isn't for users Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-11-12 21:56:42 UTC (rev 25206) +++ website/trunk/torbutton/en/index.wml 2011-11-12 22:39:58 UTC (rev 25207) @@ -85,23 +85,42 @@ <h2>Torbutton</h2> <hr> - + + <p> + Torbutton is the component in <a href="<page projects/torbrowser>">Tor + Browser Bundle</a> that takes care of application-level + security and privacy concerns in Firefox. To keep you safe, + Torbutton disables many types of active content. + </p> + + <p> + Now that the <a href="<page projects/torbrowser>">Tor Browser + Bundle</a> includes a patched version of Firefox, and because we don't + have enough developer resources to keep up with the accelerated + Firefox release schedule, the toggle model of Torbutton is <a + href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no + longer recommended</a>. <b>Users should be using Tor Browser Bundle, + not installing Torbutton themselves.</b> + </p> + + <br/><br/> <strong>Current stable version:</strong><version-torbutton><br/> <strong>Current alpha version:</strong><version-torbutton-alpha><br/> <br/> <strong>Maintainer:</strong> Mike Perry<br/> <br/> - <strong>Install Stable:</strong> Click to <a + <strong>Expert Install (Stable):</strong> Click to <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" hash="<version-hash-torbutton>" onclick="return install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>  + <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/> - <br/> <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/> <strong>Source:</strong> You can <a @@ -119,47 +138,11 @@ <br/> <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/> <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b> + <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b> - <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/> + <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b> - <br/> - - <p> - Torbutton is the component in <a href="<page projects/torbrowser>">Tor - Browser Bundle</a> that takes care of application-level security - and privacy concerns in Firefox. To keep you safe, Torbutton - disables many types of active content. You can learn more from - the <a href="en/design/index.html.en">Design Document</a>, the <a - href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more - details in the <a href="<page torbutton/torbutton-options>">Torbutton - options</a> list. - </p> - - <p> - Some users may prefer a toolbar button instead of a statusbar panel. - Torbutton lets you add a toolbar button by right-clicking - on the desired toolbar, selecting "Customize...", and then dragging the - Torbutton icon onto the toolbar. There is an option in the preferences - to hide the statusbar panel (Tools->Extensions, select Torbutton, - and click on Preferences). - </p> - - <p> - Originally Torbutton was a 1-click way for Firefox users to enable or disable - the browser's use of <a href="<page index>">Tor</a>. - (It adds a panel to the statusbar that says "Tor Enabled" (in green) or - "Tor Disabled" (in red). The user may click on the panel to toggle - the status. If the user (or some other extension) changes the proxy - settings, the change is automatically reflected in the statusbar.) But - now that the <a href="<page projects/torbrowser>">Tor Browser - Bundle</a> includes a patched version of Firefox, and because we don't - have enough developer resources to keep up with the accelerated - Firefox release schedule, the toggle model of Torbutton is <a - href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no - longer recommended</a>. - </p> - </div>  <div id = "sidecol">

1 0

r25206: {website} make the 'no longer recommended' part a bit more obvious (website/trunk/torbutton/en)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 21:56:42 +0000 (Sat, 12 Nov 2011) New Revision: 25206 Modified: website/trunk/torbutton/en/index.wml Log: make the 'no longer recommended' part a bit more obvious Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-11-12 21:50:30 UTC (rev 25205) +++ website/trunk/torbutton/en/index.wml 2011-11-12 21:56:42 UTC (rev 25206) @@ -137,6 +137,15 @@ </p> <p> + Some users may prefer a toolbar button instead of a statusbar panel. + Torbutton lets you add a toolbar button by right-clicking + on the desired toolbar, selecting "Customize...", and then dragging the + Torbutton icon onto the toolbar. There is an option in the preferences + to hide the statusbar panel (Tools->Extensions, select Torbutton, + and click on Preferences). + </p> + + <p> Originally Torbutton was a 1-click way for Firefox users to enable or disable the browser's use of <a href="<page index>">Tor</a>. (It adds a panel to the statusbar that says "Tor Enabled" (in green) or @@ -151,14 +160,6 @@ longer recommended</a>. </p> - <p> - Some users may prefer a toolbar button instead of a statusbar panel. - Torbutton lets you add a toolbar button by right-clicking - on the desired toolbar, selecting "Customize...", and then dragging the - Torbutton icon onto the toolbar. There is an option in the preferences - to hide the statusbar panel (Tools->Extensions, select Torbutton, - and click on Preferences). - </p> </div>  <div id = "sidecol">

1 0