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

[torouter/master] uap0 and not wlan0
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit acb8da4edf611c2199bbf6d3b26eeec0f69f1b56 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 00:55:27 2011 +0200 uap0 and not wlan0 --- packages/torouter-prep/configs/dnsmasq.conf | 2 +- packages/torouter-prep/configs/interfaces | 7 ++++--- .../torouter-prep/configs/tor-wireless-firewall.sh | 2 +- packages/torouter-prep/configs/udhcpd.conf | 2 +- packages/torouter-web/src/tui/config.py | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/torouter-prep/configs/dnsmasq.conf b/packages/torouter-prep/configs/dnsmasq.conf index cc6477d..2711486 100644 --- a/packages/torouter-prep/configs/dnsmasq.conf +++ b/packages/torouter-prep/configs/dnsmasq.conf @@ -83,7 +83,7 @@ no-poll # interface (eg eth0) here. # Repeat the line for more than one interface. interface=eth1 -interface=wlan0 +interface=uap0 # Or you can specify which interface _not_ to listen on except-interface=eth0 except-interface=lo diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index d1b9ba3..fbd5213 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -8,8 +8,8 @@ iface lo inet loopback # The primary network interface auto eth0 iface eth0 inet dhcp - post-up ifup wlan0 - post-down ifdown wlan0 + post-up ifup uap0 + post-down ifdown uap0 auto eth1 iface eth1 inet static @@ -23,7 +23,8 @@ iface eth1 inet static post-up /etc/init.d/dnsmasq restart # The magic Tor wireless network -iface wlan0 inet static +auto uap0 +iface uap0 inet static address 172.16.23.1 netmask 255.255.255.0 network 172.16.23.0 diff --git a/packages/torouter-prep/configs/tor-wireless-firewall.sh b/packages/torouter-prep/configs/tor-wireless-firewall.sh index bdb2587..4310e7b 100755 --- a/packages/torouter-prep/configs/tor-wireless-firewall.sh +++ b/packages/torouter-prep/configs/tor-wireless-firewall.sh @@ -7,7 +7,7 @@ NON_TOR="10.0.2.0/24 10.23.42.0/24 172.16.23.0/24" TRANS_PORT="9040" # your internal interface -INT_IF="wlan0" +INT_IF="uap0" iptables -F iptables -t nat -F diff --git a/packages/torouter-prep/configs/udhcpd.conf b/packages/torouter-prep/configs/udhcpd.conf index db88e38..04160aa 100644 --- a/packages/torouter-prep/configs/udhcpd.conf +++ b/packages/torouter-prep/configs/udhcpd.conf @@ -5,7 +5,7 @@ start 172.16.23.10 end 172.16.23.254 # The interface that udhcpd will use -interface wlan0 +interface uap0 # The maximim number of leases (includes addressesd reserved # by OFFER's, DECLINE's, and ARP conficts diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index 69ea54d..989c102 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -12,7 +12,7 @@ globals = {} authinfo = ("test", "test") # Network devices -network_devices = ('wlan0', 'eth0', 'eth1') +network_devices = ('uap0', 'eth0', 'eth1') #interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc"

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 25 Aug '11

25 Aug '11

commit b3f4d69254943b65a482c85a4d85b351af1e2712 Merge: 9ac2c7a 6657b82 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 26 00:54:10 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter freedom-maker/README | 20 +++++++++++++++++--- packages/torouter-prep/src/torouter_config.sh | 3 +++ 2 files changed, 20 insertions(+), 3 deletions(-)

1 0

[torouter/master] Change back to uap0
by hellais＠torproject.org 25 Aug '11

25 Aug '11

commit 9ac2c7a00186e1b0daf527cadf94b1f104fc3e14 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 26 00:53:44 2011 +0200 Change back to uap0 --- packages/torouter-prep/configs/dnsmasq.conf | 2 +- packages/torouter-prep/configs/interfaces | 8 ++++---- .../torouter-prep/configs/tor-wireless-firewall.sh | 2 +- packages/torouter-prep/configs/udhcpd.conf | 2 +- packages/torouter-web/src/tui/config.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/torouter-prep/configs/dnsmasq.conf b/packages/torouter-prep/configs/dnsmasq.conf index cc6477d..2711486 100644 --- a/packages/torouter-prep/configs/dnsmasq.conf +++ b/packages/torouter-prep/configs/dnsmasq.conf @@ -83,7 +83,7 @@ no-poll # interface (eg eth0) here. # Repeat the line for more than one interface. interface=eth1 -interface=wlan0 +interface=uap0 # Or you can specify which interface _not_ to listen on except-interface=eth0 except-interface=lo diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index d1b9ba3..ef3071a 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -8,8 +8,8 @@ iface lo inet loopback # The primary network interface auto eth0 iface eth0 inet dhcp - post-up ifup wlan0 - post-down ifdown wlan0 + post-up ifup uap0 + post-down ifdown uap0 auto eth1 iface eth1 inet static @@ -18,12 +18,12 @@ iface eth1 inet static network 10.23.42.0 broadcast 10.23.42.255 post-up echo 1 > /proc/sys/net/ipv4/ip_forward - # this must happen after have brought up wlan0 because it clears the nat tables + # this must happen after have brought up uap0 because it clears the nat tables post-up iptables -t nat -A POSTROUTING -s 10.23.42.0/24 -o eth0 -j MASQUERADE post-up /etc/init.d/dnsmasq restart # The magic Tor wireless network -iface wlan0 inet static +iface uap0 inet static address 172.16.23.1 netmask 255.255.255.0 network 172.16.23.0 diff --git a/packages/torouter-prep/configs/tor-wireless-firewall.sh b/packages/torouter-prep/configs/tor-wireless-firewall.sh index bdb2587..4310e7b 100755 --- a/packages/torouter-prep/configs/tor-wireless-firewall.sh +++ b/packages/torouter-prep/configs/tor-wireless-firewall.sh @@ -7,7 +7,7 @@ NON_TOR="10.0.2.0/24 10.23.42.0/24 172.16.23.0/24" TRANS_PORT="9040" # your internal interface -INT_IF="wlan0" +INT_IF="uap0" iptables -F iptables -t nat -F diff --git a/packages/torouter-prep/configs/udhcpd.conf b/packages/torouter-prep/configs/udhcpd.conf index db88e38..04160aa 100644 --- a/packages/torouter-prep/configs/udhcpd.conf +++ b/packages/torouter-prep/configs/udhcpd.conf @@ -5,7 +5,7 @@ start 172.16.23.10 end 172.16.23.254 # The interface that udhcpd will use -interface wlan0 +interface uap0 # The maximim number of leases (includes addressesd reserved # by OFFER's, DECLINE's, and ARP conficts diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index 69ea54d..989c102 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -12,7 +12,7 @@ globals = {} authinfo = ("test", "test") # Network devices -network_devices = ('wlan0', 'eth0', 'eth1') +network_devices = ('uap0', 'eth0', 'eth1') #interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc"

1 0

[tor/master] Mention that HiddenServiceDir must exist
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit cc33ac362b1e0e046ddbeae30da1810aef781e8f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 25 22:26:54 2011 +0200 Mention that HiddenServiceDir must exist --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f80c9f..bfc9766 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1339,7 +1339,7 @@ The following options are used to configure a hidden service. **HiddenServiceDir** __DIRECTORY__:: Store data files for a hidden service in DIRECTORY. Every hidden service must have a separate directory. You may use this option multiple times to - specify multiple services. + specify multiple services. DIRECTORY must be an existing directory. **HiddenServicePort** __VIRTPORT__ [__TARGET__]:: Configure a virtual port VIRTPORT for a hidden service. You may use this

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit 372262b4587d4d268d1eff56512e1691e32b92b9 Merge: 870c55b cc33ac3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 18:55:28 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Mention that HiddenServiceDir must exist
by nickm＠torproject.org 25 Aug '11

25 Aug '11

commit cc33ac362b1e0e046ddbeae30da1810aef781e8f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 25 22:26:54 2011 +0200 Mention that HiddenServiceDir must exist --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f80c9f..bfc9766 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1339,7 +1339,7 @@ The following options are used to configure a hidden service. **HiddenServiceDir** __DIRECTORY__:: Store data files for a hidden service in DIRECTORY. Every hidden service must have a separate directory. You may use this option multiple times to - specify multiple services. + specify multiple services. DIRECTORY must be an existing directory. **HiddenServicePort** __VIRTPORT__ [__TARGET__]:: Configure a virtual port VIRTPORT for a hidden service. You may use this

1 0

[torbutton/master] Bug #3809: Hide referer spoofing option
by mikeperry＠torproject.org 25 Aug '11

25 Aug '11

commit 859af3ba2182e6751f02d06ac84cf27a62d18093 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 25 15:29:54 2011 -0700 Bug #3809: Hide referer spoofing option Due to bug #3429, referer spoofing is breaking browser navigation. Since it is unsafe to fix #3429 while people still insist on using the toggle model, I'm just going to hide the referer spoofing option for now. --- src/chrome/content/preferences.xul | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 1795fc1..d293a70 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -347,7 +347,7 @@ <checkbox id="torbutton_jarCACerts" label="&torbutton.prefs.jar_ca_certs;" oncommand="torbutton_prefs_set_field_attributes(document)"/> --> - <radiogroup id="torbutton_refererSpoofGroup" label="&torbutton.prefs.refererspoofing;"> + <radiogroup id="torbutton_refererSpoofGroup" label="&torbutton.prefs.refererspoofing;" collapsed="true"> <radio id="torbutton_smartSpoof" label="&torbutton.prefs.smartspoof;" oncommand="torbutton_prefs_set_field_attributes(document)" /> <radio id="torbutton_noRefSpoof" label="&torbutton.prefs.nospoof;" oncommand="torbutton_prefs_set_field_attributes(document)" /> <radio id="torbutton_blankReferer" label="&torbutton.prefs.spoofblank;" oncommand="torbutton_prefs_set_field_attributes(document)" />

1 0

[torbutton/master] Bug #3580: Fix hotmail (but only for TBB users)
by mikeperry＠torproject.org 25 Aug '11

25 Aug '11

commit 6344196616349a814c4ce040ea01236536f44f7e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 25 13:27:53 2011 -0700 Bug #3580: Fix hotmail (but only for TBB users) Hotmail appears to have an optimization strategy that involved pre-loading all of the scripts involved in their site as object tags. When the user navigates between pages, the appropriate object tags get converted into script tags and executed. The problem for us is that docSell.allowPlugins is implemented as a content policy that blocks object tags for a given page. We use this API because the toggle model requires the ability to do per-page plugin control. Firefox 3.6 introduced a global plugin control API that allows us to enable/disable indivual plugins, but this was unfit for use in the toggle situation where tabs might sit around in the background. However, we can use it for TBB. This patch switches us to using the plugin manager API, in TBB only. --- src/chrome/content/torbutton.js | 41 ++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 36d881e..3974ab9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -18,6 +18,7 @@ var m_tb_ff3 = false; var m_tb_ff35 = false; var m_tb_ff36 = false; var m_tb_ff4 = false; +var m_tb_tbb = false; var m_tb_control_port = null; var m_tb_control_host = null; @@ -491,6 +492,10 @@ function torbutton_init() { if (environ.exists("TOR_CONTROL_PASSWD")) { m_tb_control_pass = environ.get("TOR_CONTROL_PASSWD"); + + // FIXME: We might want a check to use to set this in the future, + // but this works fine for now. + m_tb_tbb = true; } if (environ.exists("TOR_CONTROL_PORT")) { @@ -1417,6 +1422,17 @@ function torbutton_new_identity() { } +// toggles plugins: true for disabled, false for enabled +function torbutton_toggle_plugins(disable_plugins) { + if (m_tb_tbb) { + var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); + var P=PH.getPluginTags({}); + for(var i=0; i<P.length; i++) { + P[i].disabled=disable_plugins; + } + } +} + // NOTE: If you touch any additional prefs in here, be sure to update // the list in torbutton_util.js::torbutton_reset_browser_prefs() @@ -1463,6 +1479,8 @@ function torbutton_update_status(mode, force_update) { // thread torbutton_log(2, 'Toggling JS state'); + torbutton_toggle_plugins(mode && torprefs.getBoolPref("no_tor_plugins")); + torbutton_toggle_jsplugins(mode, changed && torprefs.getBoolPref("isolate_content"), torprefs.getBoolPref("no_tor_plugins")); @@ -2541,10 +2559,12 @@ function torbutton_toggle_win_jsplugins(win, tor_enabled, js_enabled, isolate_dy if (b && b.docShell) { // Only allow plugins if the tab load was from an // non-tor state and the current tor state is off. - if(kill_plugins) - b.docShell.allowPlugins = !b.__tb_tor_fetched && !tor_enabled; - else - b.docShell.allowPlugins = true; + if (!m_tb_tbb) { + if(kill_plugins) + b.docShell.allowPlugins = !b.__tb_tor_fetched && !tor_enabled; + else + b.docShell.allowPlugins = true; + } // Likewise for DNS prefetch if(m_tb_ff35) { @@ -2644,7 +2664,7 @@ function torbutton_apply_tab_tag(browser, tag) { } function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { - if (!tor_tag && no_plugins) { + if (!tor_tag && no_plugins && !m_tb_tbb) { browser.docShell.allowPlugins = tor_tag; } @@ -2713,7 +2733,7 @@ function torbutton_set_launch_state(state, session_restore) { if (state) { if(b && b.docShell){ - if(no_plugins) b.docShell.allowPlugins = false; + if(no_plugins && !m_tb_tbb) b.docShell.allowPlugins = false; if(m_tb_ff35) { if (!m_tb_ff36) /* Unified with nsIDocShell in 3.6 */ b.docShell.QueryInterface(Ci.nsIDocShell_MOZILLA_1_9_1_dns); @@ -3706,6 +3726,10 @@ function torbutton_do_startup() torbutton_log(3, "Remoting window closed."); } } + + torbutton_toggle_plugins(tor_enabled + && m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); + if (tor_enabled) { // Need to maybe generate google cookie if tor is enabled @@ -4123,7 +4147,10 @@ function torbutton_update_tags(win, new_loc) { } torbutton_apply_tab_tag(browser, !tor_tag); - browser.docShell.allowPlugins = tor_tag || !kill_plugins; + + if (!m_tb_tbb) { + browser.docShell.allowPlugins = tor_tag || !kill_plugins; + } /* We want to disable allowDNSPrefetch on Tor-loaded tabs * before the load, because we don't want prefetch to be enabled

1 0

r24967: {website} Attempt to make my people page entry less horrible. It's sti (website/trunk/about/en)
by Sebastian Hahn 25 Aug '11

25 Aug '11

Author: sebastian Date: 2011-08-25 21:48:20 +0000 (Thu, 25 Aug 2011) New Revision: 24967 Modified: website/trunk/about/en/corepeople.wml Log: Attempt to make my people page entry less horrible. It's still long Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2011-08-25 21:48:11 UTC (rev 24966) +++ website/trunk/about/en/corepeople.wml 2011-08-25 21:48:20 UTC (rev 24967) @@ -77,12 +77,13 @@ auditing, Melissa is in charge of Tor's finances, audit compliance, and keeping Tor's financial operations moving along.</dd> - <dt>Sebastian Hahn, Developer</dt> - <dd>Worked during the 2008 Google Summer of Code on a networking - application to automatically carry out tests for Tor and during - the 2009 Google Summer of Code on expanding our secure updater - to include BitTorrent support. Manages our git repository, - reviews code patches, and generally helps out a lot.</dd> + <dt>Sebastian Hahn, Developer and Advocate</dt> + <dd>One of the core contributors to Tor development, Sebastian + also works on integrating new contributors into the community. + After being a student in two Google Summer of Code programs in + a row, he became one of the mentors the following year. + He also speaks at various conferences about Tor and trains + activists to safely use Tor.</dd> <dt>Thomas S. Benjamin, Researcher</dt> <dd>Anonymous communications and bridge distribution researcher. His other work can be found on his <a

1 0

r24966: {website} chiiph is now lead vidalia developer (website/trunk/about/en)
by Sebastian Hahn 25 Aug '11

25 Aug '11

Author: sebastian Date: 2011-08-25 21:48:11 +0000 (Thu, 25 Aug 2011) New Revision: 24966 Modified: website/trunk/about/en/corepeople.wml Log: chiiph is now lead vidalia developer Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2011-08-25 21:16:49 UTC (rev 24965) +++ website/trunk/about/en/corepeople.wml 2011-08-25 21:48:11 UTC (rev 24966) @@ -55,7 +55,7 @@ explain what Tor is and can do. Helps coordinate academic researchers.</dd> <dt>Matt Edman, Vidalia Developer; Researcher</dt> - <dd>Lead developer for <a href="<page + <dd>Developer for <a href="<page projects/vidalia>">Vidalia</a>, a cross-platform Tor Graphical User Interface included in the bundles.</dd> <dt>Nathan Freitas, Mobile phone hacker</dt> @@ -164,7 +164,7 @@ <dd>Works on the artwork and design for various projects, annual reports, and brochures. His other work can be found at <a href="http://jmtodaro.com/">http://jmtodaro.com/</a>.</dd> - <dt>Tomás Touceda</dt> + <dt>Tomás Touced, Vidalia Developer</dt> <dd>Maintenance and new development for Vidalia.</dd> </dl>

1 0