- tor-commits - lists.torproject.org

r24846: {website} minor update (website/trunk)
by Runa Sandvik 29 Jun '11

29 Jun '11

Author: runa Date: 2011-06-29 19:38:10 +0000 (Wed, 29 Jun 2011) New Revision: 24846 Modified: website/trunk/wml2po.sh Log: minor update Modified: website/trunk/wml2po.sh =================================================================== --- website/trunk/wml2po.sh 2011-06-29 19:36:13 UTC (rev 24845) +++ website/trunk/wml2po.sh 2011-06-29 19:38:10 UTC (rev 24846) @@ -41,7 +41,7 @@ # The script can write the name of unprocessed files to a log. # If you want to enable this option, set the logfile here. -logfile="/home/runa/tor/wml2po.log" +logfile="" # This is the temp logfile. Leave this line even if you don't want to # log. This will be deleted when the script is done.

1 0

r24845: {website} Closed tags in faq-abuse and inthemedia (in website/trunk: docs/en press/en)
by Runa Sandvik 29 Jun '11

29 Jun '11

Author: runa Date: 2011-06-29 19:36:13 +0000 (Wed, 29 Jun 2011) New Revision: 24845 Modified: website/trunk/docs/en/faq-abuse.wml website/trunk/press/en/inthemedia.wml Log: Closed tags in faq-abuse and inthemedia Modified: website/trunk/docs/en/faq-abuse.wml =================================================================== --- website/trunk/docs/en/faq-abuse.wml 2011-06-29 19:05:15 UTC (rev 24844) +++ website/trunk/docs/en/faq-abuse.wml 2011-06-29 19:36:13 UTC (rev 24845) @@ -173,7 +173,7 @@ Some hosting providers are friendlier than others when it comes to Tor exits. For a listing see the <a href="<wiki>doc/GoodBadISPs">good and bad - ISPs wiki</a>. + ISPs wiki</a>. For a complete set of template responses to different abuse complaint types, see <a Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-06-29 19:05:15 UTC (rev 24844) +++ website/trunk/press/en/inthemedia.wml 2011-06-29 19:36:13 UTC (rev 24845) @@ -37,7 +37,7 @@ <td>CNN: Tech</td> <td><a href="http://www.cnn.com/2011/TECH/innovation/06/17/mesh.technology.revolution/in…">Starting -a revolution with technology</td> +a revolution with technology</a></td> </tr> <tr> <td>2011 June 12</td>

1 0

r24844: {website} updated the script to include translated images for the over (website/trunk)
by Runa Sandvik 29 Jun '11

29 Jun '11

Author: runa Date: 2011-06-29 19:05:15 +0000 (Wed, 29 Jun 2011) New Revision: 24844 Modified: website/trunk/po2wml.sh Log: updated the script to include translated images for the overview page Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-06-29 18:33:07 UTC (rev 24843) +++ website/trunk/po2wml.sh 2011-06-29 19:05:15 UTC (rev 24844) @@ -251,6 +251,17 @@ echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the file is overview.wml, make sure we + # include the correct set of images + if [ $wmlfile = "overview.wml" ] && [[ $lang = "de" || $lang = "es" || $lang = "fr" || + $lang = "ja" || $lang = "nl" || $lang = "no" || $lang = "pl" || $lang = "ru" || + $lang = "zh" ]] + then + sed -i "s/htw1.png/htw1_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile" + sed -i "s/htw2.png/htw2_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile" + sed -i "s/htw3.png/htw3_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the translation is Polish, include the # correct header, menu files and footer if [ $lang = "pl" ]

1 0

r24843: {website} Remove another claim that Privoxy can help protect users' an (website/trunk/about/en)
by Robert Ransom 29 Jun '11

29 Jun '11

Author: rransom Date: 2011-06-29 18:33:07 +0000 (Wed, 29 Jun 2011) New Revision: 24843 Modified: website/trunk/about/en/overview.wml Log: Remove another claim that Privoxy can help protect users' anonymity Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-06-26 01:28:30 UTC (rev 24842) +++ website/trunk/about/en/overview.wml 2011-06-29 18:33:07 UTC (rev 24843) @@ -221,9 +221,9 @@ Tor can't solve all anonymity problems. It focuses only on protecting the transport of data. You need to use protocol-specific support software if you don't want the sites you visit to see your - identifying information. For example, you can use web proxies such as - Privoxy while web browsing to block cookies and withhold information - about your browser type. + identifying information. For example, you can use Torbutton + while browsing the web to withhold some information about your computer's + configuration.

1 0

[arm/master] Configuration for the Reduced Exit Policy
by atagar＠torproject.org 29 Jun '11

29 Jun '11

commit d378c535e5b5d24424a872f9cfdb94e6e56b10a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 28 21:06:05 2011 -0700 Configuration for the Reduced Exit Policy Adding config attributes for exit policy selection in the setup wizard. The default policy is copied from: https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy --- src/settings.cfg | 143 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 132 insertions(+), 11 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 435a4d2..c945a34 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -521,7 +521,7 @@ port.label.69 TFTP port.label.70 Gopher port.label.79 Finger port.label.80 HTTP -port.label.81 Torpark +port.label.81 HTTP Alternate port.label.82 Torpark port.label.83 MIT ML port.label.88 Kerberos @@ -589,7 +589,7 @@ port.label.427 SLP port.label.443 HTTPS port.label.444 SNPP port.label.445 SMB -port.label.464 Kerberos +port.label.464 Kerberos (kpasswd) port.label.465 SMTP port.label.475 tcpnethaspsrv port.label.497 Retrospect @@ -612,8 +612,8 @@ port.label.532 netnews port.label.533 netwall port.label.540 UUCP port.label.542 commerce -port.label.543 klogin -port.label.544 klogin +port.label.543 Kerberos (klogin) +port.label.544 Kerberos (kshell) port.label.545 OSISoft PI port.label.546 DHCPv6 port.label.547 DHCPv6 @@ -659,7 +659,7 @@ port.label.706 SILC port.label.711 MPLS port.label.712 TBRPF port.label.720 SMQP -port.label.749 Kerberos +port.label.749 Kerberos (admin) port.label.750 rfile port.label.751 pump port.label.752 qrh @@ -675,17 +675,16 @@ port.label.860 iSCSI port.label.873 rsync port.label.888 CDDB port.label.901 SWAT -port.label.902 VMware -port.label.903 VMware -port.label.904 VMware +port.label.902-904 VMware port.label.911 NCA port.label.953 DNS RNDC -port.label.981 SofaWare +port.label.981 SofaWare Firewall port.label.989 FTPS port.label.990 FTPS port.label.991 NAS port.label.992 Telnet port.label.993 IMAPS +port.label.994 IRC port.label.995 POP3S port.label.999 ScimoreDB port.label.1001 JtoMB @@ -704,24 +703,38 @@ port.label.1270 SCOM port.label.1293 IPSec port.label.1433 MSSQL port.label.1434 MSSQL +port.label.1500 NetGuard port.label.1503 MSN port.label.1512 WINS port.label.1521 Oracle port.label.1526 Oracle +port.label.1533 Sametime port.label.1666 Perforce +port.label.1677 GroupWise +port.label.1723 PPTP port.label.1725 Steam port.label.1863 MSNP port.label.2049 NFS +port.label.2082 Infowave +port.label.2083 radsec port.label.2086 GNUnet +port.label.2087 ELI +port.label.2095 NBX SER +port.label.2096 NBX DIR +port.label.2102-2104 Zephyr port.label.2401 CVS port.label.2525 SMTP port.label.2710 BitTorrent port.label.3074 XBox LIVE port.label.3101 BlackBerry +port.label.3128 SQUID port.label.3306 MySQL +port.label.3389 WBT port.label.3690 SVN port.label.3723 Battle.net port.label.3724 WoW +port.label.4321 RWHOIS +port.label.4643 Virtuozzo port.label.4662 eMule port.label.5003 FileMaker port.label.5050 Yahoo IM @@ -730,6 +743,7 @@ port.label.5061 SIP port.label.5190 AIM/ICQ port.label.5222 Jabber port.label.5223 Jabber +port.label.5228 Android Market port.label.5269 Jabber port.label.5298 Jabber port.label.5432 PostgreSQL @@ -745,15 +759,122 @@ port.label.6660-6669 IRC port.label.6679 IRC port.label.6697 IRC port.label.6881-6999 BitTorrent -port.label.8008 HTTP +port.label.8000 iRDMI +port.label.8008 HTTP Alternate port.label.8010 XMPP -port.label.8080 Tomcat +port.label.8074 Gadu-Gadu +port.label.8080 HTTP Proxy +port.label.8087 SPP +port.label.8088 Radan HTTP port.label.8118 Privoxy port.label.8123 Polipo +port.label.8443 PCsync HTTPS +port.label.8888 NewsEDGE port.label.9030 Tor port.label.9050 Tor port.label.9051 Tor +port.label.9418 Git +port.label.9999 distinct +port.label.10000 Webmin +port.label.19294 Google Voice +port.label.19638 Ensim port.label.23399 Skype port.label.30301 BitTorrent port.label.33434 traceroute +# Exit policy categories and attributes used by the relay setup wizard. The +# full policy is the Reduced Exit Policy, revision 9 (edited 6/28/11): +# https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy?version… + +port.exit.misc 20-23 # FTP, SSH, Telnet +port.exit.misc 43 # WHOIS +port.exit.all 53 # DNS +port.exit.misc 79 # Finger +port.exit.web 80 # HTTP +port.exit.web 81 # HTTP alternate? +port.exit.misc 88 # Kerberos +port.exit.mail 110 # POP3 +port.exit.mail 143 # IMAP +port.exit.im 194 # IRC +port.exit.mail 220 # IMAP3 +port.exit.web 443 # HTTPS +port.exit.misc 464 # Kerberos +port.exit.im 531 # AIM/IRC +port.exit.misc 543-544 # Kerberos +port.exit.misc 563 # NNTPS +port.exit.im 706 # SILC +port.exit.misc 749 # Kerberos +port.exit.misc 873 # rsync +port.exit.misc 902-904 # VMware +port.exit.misc 981 # SofaWare Firewall Administration +port.exit.misc 989-990 # FTPS +port.exit.misc 991 # NAS +port.exit.misc 992 # Telnet +port.exit.misc 993 # IMAPS +port.exit.im 994 # IRC over SSL +port.exit.misc 995 # POP3S +port.exit.misc 1194 # OpenVPN +port.exit.misc 1220 # QuickTime +port.exit.misc 1293 # PKT-KRB-IPSec +port.exit.misc 1500 # NetGuard GuardianPro Firewall Administration / VLSI License Manager +port.exit.im 1533 # Sametime +port.exit.im 1677 # GroupWise +port.exit.misc 1723 # Microsoft Point-to-Point Tunneling Protocol +port.exit.misc 1863 # MSNP +port.exit.misc 2082 # Infowave Mobility Server +port.exit.misc 2083 # Secure Radius Service +port.exit.misc 2086 # GNUnet +port.exit.misc 2087 # Event Logging Integration +port.exit.misc 2095-2096 # NBX SER / DIR +port.exit.im 2102-2104 # Zephyr +port.exit.web 3128 # Squid Proxy +port.exit.misc 3389 # Windows Based Terminal +port.exit.misc 3690 # SVN +port.exit.misc 4321 # RWHOIS +port.exit.misc 4643 # Virtuozzo Power Panel +port.exit.im 5050 # Yahoo IM +port.exit.im 5190 # AIM/ICQ +port.exit.im 5222 # Jabber +port.exit.im 5223 # Jabber over SSL +port.exit.misc 5228 # Android Market +port.exit.misc 5900 # VNC +port.exit.im 6660-6669 # IRC +port.exit.im 6679 # IRC over SSL +port.exit.im 6697 # IRC over SSL +port.exit.misc 8000 # Intel Remote Desktop Management Interface +port.exit.web 8008 # HTTP alternate +port.exit.im 8074 # Gadu-Gadu +port.exit.web 8080 # HTTP Proxies +port.exit.misc 8087 # Simplify Media SPP Protocol +port.exit.misc 8088 # Radan HTTP +port.exit.misc 8443 # PCsync HTTPS +port.exit.misc 8888 # NewsEDGE +port.exit.misc 9418 # Git +port.exit.misc 9999 # distinct +port.exit.misc 10000 # Web-based Linux admin tool +port.exit.misc 19294 # Google Voice +port.exit.misc 19638 # Ensim Control Panel + +# Commonly encrypted ports (used to allow for policies that only include +# encrypted traffic) + +port.encrypted 22 +port.encrypted 88 +port.encrypted 443 +port.encrypted 464 +port.encrypted 543 +port.encrypted 544 +port.encrypted 563 +port.encrypted 749 +port.encrypted 981 +port.encrypted 989 +port.encrypted 990 +port.encrypted 1194 +port.encrypted 1293 +port.encrypted 1723 +port.encrypted 2083 +port.encrypted 5223 +port.encrypted 6679 +port.encrypted 6697 +port.encrypted 8443 +

1 0

[arm/master] Bridge configuration options for the wizard
by atagar＠torproject.org 29 Jun '11

29 Jun '11

commit bfb7140ca05ebb32a2194d844879805639907445 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 29 10:02:15 2011 -0700 Bridge configuration options for the wizard --- src/cli/wizard.py | 58 ++++++++++++++++++++++++++++++---------------------- src/settings.cfg | 5 ++++ 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 7a9eaa0..c6186e5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -15,31 +15,38 @@ from util import enum, uiTools RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") -RelayOptions = {RelayType.RELAY: (Options.NICKNAME, - Options.CONTACT, - Options.NOTIFY, - Options.BANDWIDTH, - Options.LIMIT, - Options.CLIENT, - Options.PORTFORWARD, - Options.STARTUP), - RelayType.EXIT: (Options.NICKNAME, - Options.CONTACT, - Options.NOTIFY, - Options.BANDWIDTH, - Options.LIMIT, - Options.CLIENT, - Options.PORTFORWARD, - Options.STARTUP, - Options.DIVIDER, - Options.NOTICE, - Options.POLICY, - Options.WEBSITES, - Options.EMAIL, - Options.IM, - Options.MISC, - Options.PLAINTEXT)} +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE") +RelayOptions = {RelayType.RELAY: (Options.NICKNAME, + Options.CONTACT, + Options.NOTIFY, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP), + RelayType.EXIT: (Options.NICKNAME, + Options.CONTACT, + Options.NOTIFY, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP, + Options.DIVIDER, + Options.NOTICE, + Options.POLICY, + Options.WEBSITES, + Options.EMAIL, + Options.IM, + Options.MISC, + Options.PLAINTEXT), + RelayType.BRIDGE: (Options.DISTRIBUTE, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP + )} # custom exit policy options CUSTOM_POLICIES = (Options.WEBSITES, Options.EMAIL, Options.IM, Options.MISC, Options.PLAINTEXT) @@ -54,6 +61,7 @@ DISABLED_COLOR = "cyan" CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", + "wizard.message.bridge": "", "wizard.message.exit": "", "wizard.toggle": {}, "wizard.suboptions": [], diff --git a/src/settings.cfg b/src/settings.cfg index c945a34..f05dd71 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -344,6 +344,7 @@ msg.ARM_DEBUG Unable to query process resource usage from ps wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. wizard.message.exit Exits connect between the Tor network and the outside Internet. This is the most vitally important role you can take, but it also needs some forethought. Please read 'http://www.atagar.com/torExitTips/' before proceeding further to avoid any nasty surprises! +wizard.message.bridge Bridges are non-public relays used as stepping stones for censored users for accessing the Tor network. wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled @@ -356,6 +357,7 @@ wizard.toggle Email => Allow, Block wizard.toggle Im => Allow, Block wizard.toggle Misc => Allow, Block wizard.toggle Plaintext => Allow, Block +wizard.toggle Distribute => Automated, Manual wizard.suboptions Websites wizard.suboptions Email @@ -376,6 +378,7 @@ wizard.default Email => true wizard.default Im => true wizard.default Misc => true wizard.default Plaintext => true +wizard.default Distribute => true wizard.label.general Cancel => Cancel wizard.label.general Back => Previous @@ -399,6 +402,7 @@ wizard.label.opt Email => Receiving Email wizard.label.opt Im => Instant Messaging wizard.label.opt Misc => Other Services wizard.label.opt Plaintext => Unencrypted Traffic +wizard.label.opt Distribute => Distribution wizard.description.general Cancel => Close without starting Tor. wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. @@ -420,6 +424,7 @@ wizard.description.opt Email => Protocols for receiving, but not sending email. wizard.description.opt Im => Common instant messaging protocols including Jabber, IRC, ICQ, AIM, Yahoo, MSN, SILC, GroupWise, Gadu-Gadu, Sametime, and Zephyr. wizard.description.opt Misc => Protocols from the default policy that aren't among the above. wizard.description.opt Plaintext => When blocked the policy will exclude ports that aren't commonly encrypted. +wizard.description.opt Distribute => If automated then we'll attempt to get your bridge to censored users (email auto-responders, activist networks, etc). Otherwise it'll be up to you to distribute the bridge address to people who need it. # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions

1 0

[tordnsel/master] bump the version to 0.1.1-dev
by andrew＠torproject.org 29 Jun '11

29 Jun '11

commit 4ca41e7b55f5dfabd2aa4e47527434257891b4e2 Author: Andrew Lewman <andrew(a)torproject.org> Date: Tue Jun 28 22:38:04 2011 -0400 bump the version to 0.1.1-dev --- tordnsel.cabal | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tordnsel.cabal b/tordnsel.cabal index bd7972e..ccd68a8 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -1,5 +1,5 @@ Name: TorDNSEL -Version: 0.1.1 +Version: 0.1.1-dev Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes Description: TorDNSEL implements a design for a DNSBL-style interface for detecting connections exiting the Tor network. This design and its rationale @@ -59,7 +59,7 @@ Other-Modules: TorDNSEL.Config, HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto -GHC-Options: -O2 -Wall -Werror -DVERSION="0.1.1" +GHC-Options: -O2 -Wall -Werror -DVERSION="0.1.1-dev" Executable: runtests Buildable: False

1 0

[tordnsel/master] changelog clean up, version bump correctly this time, prepare for 0.1.1
by andrew＠torproject.org 29 Jun '11

29 Jun '11

commit f612e4aa4095488ab194808ac0b8b1340ae05af0 Author: Andrew Lewman <andrew(a)torproject.org> Date: Tue Jun 28 22:25:10 2011 -0400 changelog clean up, version bump correctly this time, prepare for 0.1.1 tag. --- ChangeLog | 5 +++++ tordnsel.cabal | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54df4d8..e7239d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +0.1.1 - 2011-06-28 + - Correctly label the release version and Changelog. + - Add updated website and maintainers in tordnsel.cabal. + - Document the tordnsel init script for Debian. + 0.1.0 - 2011-06-28 o Deployment: - Add support for logging messages to stdout, stderr, syslog, or to a file. diff --git a/tordnsel.cabal b/tordnsel.cabal index 10f2bbb..bd7972e 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -1,5 +1,5 @@ Name: TorDNSEL -Version: 0.0.6-dev +Version: 0.1.1 Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes Description: TorDNSEL implements a design for a DNSBL-style interface for detecting connections exiting the Tor network. This design and its rationale @@ -7,14 +7,14 @@ Description: TorDNSEL implements a design for a DNSBL-style interface for License: PublicDomain License-File: LICENSE Homepage: http://p56soo2ibjkx23xo.onion/ -Package-URL: http://p56soo2ibjkx23xo.onion/dist/tordnsel-0.0.6.tar.gz +Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.… Author: tup -Maintainer: tup.tuple(a)googlemail.com +Maintainer: tup.tuple(a)googlemail.com, lunar(a)debian.org, andrew(a)torproject.org Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, containers>=0.1 -Tested-With: GHC==6.6, GHC==6.8, GHC==6.10 +Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 @@ -59,7 +59,7 @@ Other-Modules: TorDNSEL.Config, HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto -GHC-Options: -O2 -Wall -Werror -DVERSION="0.0.6-dev" +GHC-Options: -O2 -Wall -Werror -DVERSION="0.1.1" Executable: runtests Buildable: False

1 0

[torbutton/master] Make it harder to accidentally toggle torbutton.
by mikeperry＠torproject.org 29 Jun '11

29 Jun '11

commit 20d6479ab2e32b868d336b81f0a1a25799272ac2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jun 28 18:44:29 2011 -0700 Make it harder to accidentally toggle torbutton. Also make clicking provide a menu rather than auto-toggle. --- src/chrome/content/popup.xul | 4 ++-- src/chrome/content/torbutton.js | 13 ++++--------- src/chrome/content/torbutton.xul | 11 ++++++----- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index f96b821..bd6fc35 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -9,12 +9,12 @@ <stringbundleset id="torbutton-stringbundleset"> <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> </stringbundleset> - <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();"> + <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();" + anchor="torbutton-button" position="after_start"> <menuitem id="torbutton-toggle" label="&torbutton.context_menu.toggle;" accesskey="&torbutton.context_menu.toggle.key;" insertafter="context-stop" - key="torbutton-toggle-key" oncommand="torbutton_toggle(true)"/> <menuitem id="torbutton-preferences" label="&torbutton.context_menu.preferences;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2a5d8ca..2d90676 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1726,15 +1726,10 @@ function torbutton_close_on_toggle(mode) { function torbutton_check_protections() { - var pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); - // XXX: This should always be visible if the user enabled it. It does seem to have - // other bugs though. - /* && ((!m_tb_prefs.getBoolPref("extensions.torbutton.tor_memory_jar") - && m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")) - || (!m_tb_prefs.getBoolPref("extensions.torbutton.nontor_memory_jar") - && !m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"))); - */ - document.getElementById("torbutton-cookie-protector").disabled = !pref; + var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); + var locked_pref = m_tb_prefs.getBoolPref("extensions.torbutton.locked_mode") + document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref; + document.getElementById("torbutton-toggle").collapsed = locked_pref; } function torbutton_open_cookie_dialog() { diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index f600f89..8e9cde6 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -29,9 +29,10 @@ class="toolbarbutton-1 chromeclass-toolbar-additional" label="Torbutton" tooltiptext="&torbutton.button.tooltip;" - context="torbutton-context-menu" - oncommand="torbutton_toggle(false);" /> + menu="torbutton-context-menu" + context="torbutton-context-menu"/> </toolbarpalette> +  <statusbar id="status-bar"> <statusbarpanel id="torbutton-panel" insertbefore="statusbar-updates" - context="torbutton-context-menu" - onclick="if (event.button == 0) torbutton_toggle(false)"/> + menu="torbutton-context-menu" + context="torbutton-context-menu" />  </statusbar> <popup id="contentAreaContextMenu">

1 0

[arm/master] Adding wizard option for port forwarding
by atagar＠torproject.org 28 Jun '11

28 Jun '11

commit b8101c830699b2c931c30e8a0fdaa10ca8e34d3d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 28 08:52:35 2011 -0700 Adding wizard option for port forwarding Wizard option for the PortForwarding config option. This will need to be omitted if... - "tor-fw-helper" doesn't exist in the user's PATH - tor doesn't have the PortForwarding option (introduced in 0.2.3.1-alpha) --- src/cli/wizard.py | 4 +++- src/settings.cfg | 4 ++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index d2fb067..7a9eaa0 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -15,13 +15,14 @@ from util import enum, uiTools RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.PORTFORWARD, Options.STARTUP), RelayType.EXIT: (Options.NICKNAME, Options.CONTACT, @@ -29,6 +30,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.PORTFORWARD, Options.STARTUP, Options.DIVIDER, Options.NOTICE, diff --git a/src/settings.cfg b/src/settings.cfg index 0ab57a2..435a4d2 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -347,6 +347,7 @@ wizard.message.exit Exits connect between the Tor network and the outside Intern wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled +wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No wizard.toggle Notice => Yes, No wizard.toggle Policy => Default, Custom @@ -367,6 +368,7 @@ wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true wizard.default Client => false +wizard.default Portforward => true wizard.default Notice => true wizard.default Policy => true wizard.default Websites => true @@ -388,6 +390,7 @@ wizard.label.opt Notify => Issue Notification wizard.label.opt Bandwidth => Relay Speed wizard.label.opt Limit => Monthly Limit wizard.label.opt Client => Client Usage +wizard.label.opt Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Notice => Disclaimer Notice wizard.label.opt Policy => Exit Policy @@ -408,6 +411,7 @@ wizard.description.opt Notify => Sends automated email notifications to the abov wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. wizard.description.opt Client => Enable this if you would like to use Tor yourself. This opens or closes the SOCKS port used by applications for connecting to Tor. +wizard.description.opt Portforward => If needed, attempts NAT traversal using UPnP and NAT-PMP. This allows for automatic port forwarding on most home routers. wizard.description.opt Startup => Runs Tor in the background when the system starts. wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice) wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy)

1 0