- tor-commits - lists.torproject.org

[tor/maint-0.2.3] Revert "6819: typo in torrc.sample.in"
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 45439bfced7f41c2e0beecb715880cb83d421618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 15:37:47 2012 -0400 Revert "6819: typo in torrc.sample.in" This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users. --- changes/bug6819 | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/changes/bug6819 b/changes/bug6819 deleted file mode 100644 index 8b5c224..0000000 --- a/changes/bug6819 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on - 0.2.3.14-alpha. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f30fc32..a1a08aa 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -16,7 +16,7 @@ ## configure one below. Set "SocksPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. #SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this address:port too. +#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept

1 0

[torbutton/master] Disable update tor proxy filter.
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 0197222e341ed7f331cfaf9a1582c84f963348df Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 14:43:19 2012 -0700 Disable update tor proxy filter. It might not be causing any problems, but it's not functional any more either. --- src/chrome/content/torbutton.js | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a7c91dc..2ced2fd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3894,7 +3894,7 @@ unregister : function() { } // Bug 1506 P0: Forces torbutton updates over tor when in non-tor mode. -// Kill it. +// Actually, this observer is already disabled due to being irrelevant. var torbutton_proxyservice = { applyFilter : function(ps, uri, proxy) { try { @@ -4065,7 +4065,8 @@ function torbutton_do_main_window_startup() torbutton_unique_pref_observer.register(); torbutton_http_observer.register(); torbutton_cookie_observer.register(); - torbutton_proxyservice.register(); + // Not needed + //torbutton_proxyservice.register(); // Bug 1506: This is probably the most important observer in this function // XXX: We should fold this into our code/move it to its own component @@ -4485,7 +4486,8 @@ function torbutton_close_window(event) { torbutton_unique_pref_observer.unregister(); torbutton_http_observer.unregister(); torbutton_cookie_observer.unregister(); - torbutton_proxyservice.unregister(); + // Not needed + //torbutton_proxyservice.unregister(); // XXX: We should fold this into our code.. SSC_controller.removeListener();

1 0

[torbutton/master] Bug 6803: Read proxy environment variables early on
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 9790fdae64a4304032dce581b030974bb11c25f1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 19:12:12 2012 -0700 Bug 6803: Read proxy environment variables early on It turns out Firefox 15 appears to be caching proxy settings for a particular URL. We needed to be able to retrieve our new proxy settings before anything else runs. Hence, move the env checks to XPCOM. --- src/chrome/content/torbutton.js | 62 ++++++++++++++------------------------ src/components/crash-observer.js | 40 ++++++++++++++++++++++++ src/install.rdf | 2 +- 3 files changed, 64 insertions(+), 40 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2ced2fd..1f82836 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -505,6 +505,14 @@ function torbutton_init_toolbutton() // called once per browser window.. This might belong in a component. function torbutton_init() { torbutton_log(3, 'called init()'); + + if (m_tb_wasinited) { + return; + } + m_tb_wasinited = true; + + m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); // Determine if we are firefox 3 or not. var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] @@ -542,16 +550,20 @@ function torbutton_init() { m_tb_ff36 = false; } + try { + var test = m_tb_prefs.getCharPref("torbrowser.version"); + m_tb_tbb = true; + torbutton_log(3, "This is a Tor Browser"); + } catch(e) { + torbutton_log(3, "This is not a Tor Browser: "+e); + } + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); 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; } else if (environ.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) { var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE"); try { @@ -582,19 +594,10 @@ function torbutton_init() { // listen for our toolbar button being added so we can initialize it torbutton_init_toolbutton(); - if (!m_tb_wasinited) { - // Runs every time a new window is opened - m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); + torbutton_init_jshooks(); - torbutton_init_jshooks(); - - torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); - m_tb_wasinited = true; - } else { - torbutton_log(1, 'skipping pref observer init'); - } + torbutton_log(1, 'registering pref observer'); + torbutton_window_pref_observer.register(); //setting up context menu var contextMenu = document.getElementById("contentAreaContextMenu"); @@ -956,7 +959,8 @@ function torbutton_do_async_versioncheck() { if (!m_tb_tbb || !m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { return; } - torbutton_log(3, "Checking version"); + torbutton_log(3, "Checking version with socks port: " + +m_tb_prefs.getIntPref("extensions.torbutton.socks_port")); try { var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] .createInstance(Components.interfaces.nsIXMLHttpRequest); @@ -3116,6 +3120,8 @@ function torbutton_do_versioncheck() { function torbutton_reload_homepage() { var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", Components.interfaces.nsIPrefLocalizedString).data; + + torbutton_log(3, "Reloading homepage: "+homepage); gBrowser.loadURI(homepage, null, null); } @@ -4196,28 +4202,6 @@ function torbutton_do_startup() torbutton_new_google_cookie(); } - // Bug 1506: Still want to get these env vars - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) { - m_tb_prefs.setIntPref('extensions.torbutton.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - if (m_tb_tbb) { - m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - } - } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050); - } - - if (environ.exists("TOR_SOCKS_HOST")) { - m_tb_prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); - if (m_tb_tbb) { - m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); - } - } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); - } - if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { var o_stringbundle = torbutton_get_stringbundle(); var warning = o_stringbundle.GetStringFromName("torbutton.popup.short_torbrowser"); diff --git a/src/components/crash-observer.js b/src/components/crash-observer.js index 776aed5..ab97fba 100644 --- a/src/components/crash-observer.js +++ b/src/components/crash-observer.js @@ -54,6 +54,14 @@ function CrashObserver() { this.is_ff4 = false; } + try { + var test = this._prefs.getCharPref("torbrowser.version"); + this.is_tbb = true; + this.logger.log(3, "This is a Tor Browser's XPCOM"); + } catch(e) { + this.logger.log(3, "This is not a Tor Browser's XPCOM"); + } + if (this.is_ff4) { // Bug 1506 P2/P3: You probably want to register this observer to clean up // prefs if you're going to support using normal firefox. @@ -102,6 +110,36 @@ CrashObserver.prototype = { } }, + // Bug 6803: We need to get the env vars early due to + // some weird proxy caching code that showed up in FF15. + // Otherwise, homepage domain loads fail forever. + getProxySettings: function() { + // Bug 1506: Still want to get these env vars + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) { + this.logger.log(3, "Resetting socks port to "+environ.get("TOR_SOCKS_PORT")); + this._prefs.setIntPref('extensions.torbutton.socks_port', + parseInt(environ.get("TOR_SOCKS_PORT"))); + if (this.is_tbb) { + this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + } + } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { + this._prefs.setIntPref('extensions.torbutton.socks_port', 9050); + } + + if (environ.exists("TOR_SOCKS_HOST")) { + this._prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); + if (this.is_tbb) { + this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); + } + } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { + this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); + } + + }, + observe: function(subject, topic, data) { if(topic == "profile-after-change") { // Bug 1506 P1: We listen to these prefs as signals for startup, @@ -116,6 +154,8 @@ CrashObserver.prototype = { this._prefs.setBoolPref("extensions.torbutton.crashed", true); } this._prefs.setBoolPref("extensions.torbutton.normal_exit", false); + + this.getProxySettings(); } else if (topic == "em-action-requested") { this.logger.log(3, "Uninstall action requested.."); // http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html diff --git a/src/install.rdf b/src/install.rdf index 7eac84a..24d314d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -10,7 +10,7 @@ em:name="Torbutton" em:creator="Mike Perry" em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" - em:version="1.4.6.1" + em:version="1.4.6.2" em:homepageURL="https://www.torproject.org/torbutton/" em:optionsURL="chrome://torbutton/content/preferences.xul" em:iconURL="chrome://torbutton/skin/tor.png"

1 0

[torbutton/master] Update changelog for 1.4.6.2.
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 39af4fa99ad74badc65bf3bb973adb6dc9d955b0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Sep 12 12:16:13 2012 -0700 Update changelog for 1.4.6.2. --- src/CHANGELOG | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index df682d0..05cf8cb 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.4.6.2 + 12 Sep 2012 + * bug 6803: Set proxy settings earlier to fix broken homepage load on FF15 + * bug 6254: Support transparent Tor mode through TOR_TRANSPROXY=1 env var. + 1.4.6.1 30 Aug 2012 * Bug 6737: Disable window.screen hooks for FF15+ (fixes exception alert)

1 0

[torbutton/master] Bug 6254: Listen for TOR_TRANSPROXY env var to enable transproxy mode
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit d7c7c5770640619d2433a4ef70f7364401b2abaa Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 19:17:30 2012 -0700 Bug 6254: Listen for TOR_TRANSPROXY env var to enable transproxy mode Listen for the existence of the TOR_TRANSPROXY env var, and set prefs appropriately. --- src/chrome/content/torbutton_util.js | 23 +++++++++++++++++++---- src/components/crash-observer.js | 21 ++++++++++++++++++++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index b6b4966..7d1effd 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -151,7 +151,14 @@ function torbutton_check_status() { else remote_dns = true; - return ((liveprefs.getIntPref("type") == 1) && + var proxy_type = 1; + if (torprefs.getCharPref('settings_method') == 'transparent') { + remote_dns = true; // Hack. Transparent has remote_dns disabled + proxy_type = 0; + } + + return ( + (liveprefs.getIntPref("type") == proxy_type) && torbutton_log(1, "Type is true") && (liveprefs.getCharPref("http") == torprefs.getCharPref('http_proxy')) && torbutton_log(1, "Http proxy") && @@ -207,10 +214,18 @@ function torbutton_activate_tor_settings() liveprefs.setIntPref('socks_version', torprefs.getIntPref('socks_version')); liveprefs.setCharPref('no_proxies_on', torprefs.getCharPref('no_proxies_on')); liveprefs.setBoolPref('share_proxy_settings', false); - if (torbutton_check_socks_remote_dns()) { - liveprefs.setBoolPref('socks_remote_dns', true); + + if (torprefs.getCharPref('settings_method') == 'transparent') { + liveprefs.setIntPref('type', 0); + if (torbutton_check_socks_remote_dns()) { + liveprefs.setBoolPref('socks_remote_dns', false); + } + } else { + liveprefs.setIntPref('type', 1); + if (torbutton_check_socks_remote_dns()) { + liveprefs.setBoolPref('socks_remote_dns', true); + } } - liveprefs.setIntPref('type', 1); torbutton_log(2, 'Done activating tor settings'); } diff --git a/src/components/crash-observer.js b/src/components/crash-observer.js index ab97fba..5ecac6a 100644 --- a/src/components/crash-observer.js +++ b/src/components/crash-observer.js @@ -124,6 +124,12 @@ CrashObserver.prototype = { parseInt(environ.get("TOR_SOCKS_PORT"))); if (this.is_tbb) { this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + + // XXX: Hack for TBB people who alternate between transproxy and non + this._prefs.setCharPref('extensions.torbutton.settings_method', 'recommended'); + this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', false); + this._prefs.setBoolPref('network.proxy.socks_remote_dns', true); + this._prefs.setIntPref('network.proxy.type', 1); } } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { this._prefs.setIntPref('extensions.torbutton.socks_port', 9050); @@ -137,7 +143,20 @@ CrashObserver.prototype = { } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); } - + + if (environ.exists("TOR_TRANSPROXY")) { + this.logger.log(3, "Resetting Tor settings to transproxy"); + this._prefs.setCharPref('extensions.torbutton.settings_method', 'transparent'); + this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', true); + this._prefs.setIntPref('extensions.torbutton.socks_port', 0); + this._prefs.setCharPref('extensions.torbutton.socks_host', ""); + if (this.is_tbb) { + this._prefs.setBoolPref('network.proxy.socks_remote_dns', false); + this._prefs.setIntPref('network.proxy.type', 0); + this._prefs.setIntPref('network.proxy.socks_port', 0); + this._prefs.setCharPref('network.proxy.socks', ""); + } + } }, observe: function(subject, topic, data) {

1 0

[tor-cloud/master] Really bundle with ubuntu precise
by runa＠torproject.org 12 Sep '12

12 Sep '12

commit edc8ba1e11233824e6393cfde4e63b566b6edd7f Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Sep 12 20:17:57 2012 +0100 Really bundle with ubuntu precise --- build.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 26c7e79..2ea398c 100755 --- a/build.sh +++ b/build.sh @@ -20,8 +20,8 @@ # Tor Cloud is developed and maintained by partnership between # ExpressionTech and The Tor Project. # -# Bundle and publish instance of canonical AMI Ubuntu 10.04 LTS (Lucid Lynx), -# modified to run as a Tor bridge relay, private relay or middle realy on Amazon EC2 +# Bundle and publish instance of Ubuntu modified to run as a Tor bridge +# on Amazon EC2 # Define your Amazon credentials for ec2-api-tools to function export EC2_PRIVATE_KEY=/path/to/pk.cert @@ -83,7 +83,7 @@ echo "After attaching the volume, sleep for 20 seconds..." sleep 20 # Get the files we need -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/SHA256SUMS && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-… -O ubuntu-10.04-server-cloudimg-i386.tar.gz" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/SHA256SUMS && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/SHA256SUMS.gpg && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/ubuntu-12.04-server-… -O ubuntu-12.04-server-cloudimg-i386.tar.gz" # Verify the signature echo "Get the GPG key" @@ -96,11 +96,11 @@ echo "Check the return code" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo grep Good /mnt/verify.txt" echo "See if the hashes match. If all else fails, lock ourselves out of the instance" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then if [ `grep ubuntu-10.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` != `sha256sum /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` ]; then 'Hash in SHA256SUMS file does not match sha256sum of .tar.gz, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'No good signature in verify.txt, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then if [ `grep ubuntu-12.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` != `sha256sum /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` ]; then 'Hash in SHA256SUMS file does not match sha256sum of .tar.gz, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'No good signature in verify.txt, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" # Set the correct permission for /mnt, extract image and continue the build process echo "Verified the signature, continue with the build process" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # this is our startup file that loads tor-prep.sh on first boot 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:/rc.local -O /mnt/src/etc/rc.local" @@ -144,7 +144,7 @@ RANDOM=$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c8`) # Finally register and publish the image echo "Registering and publishing the image..." -ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}]" +ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 12.04 LTS [Precise Pangolin] - [${region}]" # cleanup ec2-detach-volume --region ${region} ${vol}

1 0

[compass/master] Remove filterArgs()
by karsten＠torproject.org 12 Sep '12

12 Sep '12

commit 7115b47ebd6bc40388dd14a45299a77ebe13c040 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Wed Sep 12 20:47:31 2012 +0530 Remove filterArgs() I previously added a 'hacky' filterArgs() to remove the unnecessary parameters from the GET request by setting the 'name' parameter to null for empty args, but it's broken now and I need to remove the empty params and reconstruct the URL manually using javascript. I'd rather just let them be for now. --- static/js/custom.js | 11 ----------- templates/index.html | 1 - 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index 6ef85be..2144e89 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -26,17 +26,6 @@ function doAjax(){ } } -function filterArgs() { - var myForm = document.getElementById('form'); - var allInputs = myForm.getElementsByTagName('input'); - var input, i; - for(i = 0; input = allInputs[i]; i++) { - if(input.getAttribute('name') && !input.value) { - input.setAttribute('name', ''); - } - } -} - function parseArgs(query){ var newQuery = {}, key, value; query = String(query); diff --git a/templates/index.html b/templates/index.html index 65a5c6a..9ffe0d2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -165,7 +165,6 @@ <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> - filterArgs(); doAjax(); setOptions(); </script>

1 0

[tor/master] Check ewma_enabled before doing circ-has-become-inactive check
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 5ade2786050dcf07ee6491145add86da5c21739d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:57:58 2012 -0400 Check ewma_enabled before doing circ-has-become-inactive check This avoids a possible crash bug in flush_from_first_active_circuit. Fixes bug 6341; bugfix on 0.2.2.7-alpha. Bug reported and fixed by a pseudonymous user on IRC. --- changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug6341 b/changes/bug6341 new file mode 100644 index 0000000..04e52c7 --- /dev/null +++ b/changes/bug6341 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a possible crash bug when checking for deactivated circuits + in connection_or_flush_from_first_active_circuit(). Fixes bug + 6341; bugfix on 0.2.2.7-alpha. Bug report and fix received + pseudonymously. diff --git a/src/or/relay.c b/src/or/relay.c index 3e418ea..b1913e7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2464,7 +2464,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, tor_assert(tmp == cell_ewma); add_cell_ewma_to_conn(conn, cell_ewma); } - if (circ != conn->active_circuits) { + if (!ewma_enabled && circ != conn->active_circuits) { /* If this happens, the current circuit just got made inactive by * a call in connection_write_to_buf(). That's nothing to worry about: * circuit_make_inactive_on_conn() already advanced conn->active_circuits

1 0

[tor/master] Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 1f5a7917f5e742c9d64c835439a5ea337e9e934a Merge: 4aff97c 5ade278 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:10:59 2012 -0400 Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3 changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 35e19b9498e3d23d87d7adacd4ec27969d63d315 Merge: 6a88615 1f5a791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:11:16 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0