June 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Check that socket is defined before checking bufferedAmount.
by dcf＠torproject.org 11 Jun '13

11 Jun '13

commit cba4501d23f6734fea4965f458ad99204e7585c9 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 11 08:56:39 2013 -0700 Check that socket is defined before checking bufferedAmount. client_s and relay_s are not always both defined now. This was the cause of #9009. --- ChangeLog | 5 +++++ proxy/flashproxy.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e03710..791224c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,11 @@ window.navigator.language when possible. Patch by Arlo Breault. Fixes bug 8827. + o Proxies now attempt to connect to the client first, and only connect + to the relay after the client connection is successful. This is + meant to reduce the number of connections to the relay when clients + haven't set up port forwarding. Introduced bug 9009, later fixed. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index d52a24b..cb54f23 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -813,8 +813,8 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { this.relay_s.close(); } - if (this.r2c_schedule.length > 0 || this.client_s.bufferedAmount > 0 - || this.c2r_schedule.length > 0 || this.relay_s.bufferedAmount > 0) + if (this.r2c_schedule.length > 0 || (is_open(this.client_s) && this.client_s.bufferedAmount > 0) + || this.c2r_schedule.length > 0 || (is_open(this.relay_s) && this.relay_s.bufferedAmount > 0)) this.flush_timeout_id = setTimeout(this.flush.bind(this), this.rate_limit.when() * 1000); }; }

1 0

[flashproxy/master] Exclude proxies that don't send r=1.
by dcf＠torproject.org 11 Jun '13

11 Jun '13

commit 676ee2d2c5d29d387389a520caa9f80bafd38f78 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 11 07:43:47 2013 -0700 Exclude proxies that don't send r=1. Most proxies should have refreshed themselves since a9c43cf5. --- facilitator/facilitator.cgi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 266905d..3adbc15 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -58,6 +58,11 @@ def do_get(): if len(path_parts) == 2 and path_parts[0] == "reg": url_reg(path_parts[1]) elif len(path_parts) == 0: + # Check for recent enough flash proxy protocol. + r = fs.getlist("r") + if len(r) != 1 or r[0] != "1": + exit_error(400) + try: reg = fac.get_reg(FACILITATOR_ADDR, remote_addr) or "" except Exception:

1 0

[tor-glossary/master] only names should be capitalized, add a few new terms
by runa＠torproject.org 11 Jun '13

11 Jun '13

commit 8cefb4c7b418bdeb138ad6cef05466d2d15a2314 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Jun 11 10:44:11 2013 -0400 only names should be capitalized, add a few new terms --- glossary_en.txt | 216 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 110 insertions(+), 106 deletions(-) diff --git a/glossary_en.txt b/glossary_en.txt index 93ee998..85eb199 100644 --- a/glossary_en.txt +++ b/glossary_en.txt @@ -1,115 +1,119 @@ -About -Add-on -Address -Advanced -Anonymize -Application -Apply -Archive -Authenticate -Back -Bridge -Browse -Cancel -Censored -Circuit -Clear -Client -Close -Computer -Connect -Connection -Consensus -Control -Control Panel -Control Password -Control Port -Cookie -Debug -Delete -Directory -Directory Authority -Download -Drive -Email -Email provider -Encryption -Error -Executable -Exit -Exit enclave -Exit relay -Extension -Extract -Failed -File -Find -Fingerprint -Folder -Forward -General -Guard -Handshake -Help +about +add-on +address +advanced +anonymize +application +apply +archive +authenticate +back +bridge +browse +cancel +censored +circuit +clear +client +close +computer +connect +connection +consensus +control +control panel +control password +control port +cookie +debug +delete +directory +directory authority +download +drive +email +email provider +encryption +error +executable +exit +exit enclave +exit relay +extension +extract +failed +file +find +fingerprint +flash proxy +folder +forward +general +guard +handshake +help Hidden Service -Hide -History -Home -Identity -Ignore -Info -Install +hide +history +home +identity +ignore +info +install Internet Internet Service Provider IP address ISP -Key -Language -License -Location -Log +key +language +license +location +log My Computer -Name -Navigate -Network -New -Notice +name +navigate +network +new +notice +obfsproxy Onion Address -Open -Organize -Package -Password -Path -Plugin -Port -Process -Program -Proxy -Quit -Recommend -Relay -Rename -Reset -Save -Search -Security -Server -Service -Settings -Signature -Size -Software -Status -Stream -Tab -Tools +open +organize +package +password +path +Pluggable Transports Bundle +plugin +port +process +program +proxy +quit +recommend +relay +rename +reset +save +search +security +server +service +settings +signature +size +software +status +stream +tab +tools Tor Tor Browser Bundle -Torify -Traffic -Transparent proxy -Unknown -Update -User manual -View -Warning +torify +traffic +transparent proxy +unknown +update +user manual +Vidalia +view +warning

1 0

[tor-browser/tor-browser-17.0.6esr-5] Build determinism fix: buildlist.py is non-determistic during make.
by mikeperry＠torproject.org 11 Jun '13

11 Jun '13

commit 4a0236529cfbc134e8b1673c2bd3ca435aef9b94 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 11 02:19:19 2013 -0700 Build determinism fix: buildlist.py is non-determistic during make. --- config/buildlist.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/buildlist.py b/config/buildlist.py index 71677e4..e7d325c 100644 --- a/config/buildlist.py +++ b/config/buildlist.py @@ -24,12 +24,11 @@ def addEntriesToListFile(listFile, entries): f.close() else: existing = set() - f = open(listFile, 'a') for e in entries: if e not in existing: - f.write("%s\n" % e) existing.add(e) - f.close() + f = open(listFile, 'w') + f.write("\n".join(sorted(existing))+"\n") finally: lock = None

1 0

r26214: {website} fix the css for the headers, try updating the div one more t (in website/trunk: css en)
by Andrew Lewman 11 Jun '13

11 Jun '13

Author: phobos Date: 2013-06-11 02:12:45 +0000 (Tue, 11 Jun 2013) New Revision: 26214 Modified: website/trunk/css/typography.css website/trunk/en/index.wml Log: fix the css for the headers, try updating the div one more time Modified: website/trunk/css/typography.css =================================================================== --- website/trunk/css/typography.css 2013-06-11 01:57:39 UTC (rev 26213) +++ website/trunk/css/typography.css 2013-06-11 02:12:45 UTC (rev 26214) @@ -111,7 +111,7 @@ #nav ul { font-size: 1.167em; } #nav ul li { list-style: none; } - + #nav ul li a:link, #nav ul li a:visited { color: #23300e; @@ -214,7 +214,8 @@ table h2, #home-our-projects h2, -#home-announcements h2 { +#home-announcements h2, +#home-users h2 { background: url(../images/table-head.jpg) left top repeat-x; color: #f6f6ed; padding-left: 10px; @@ -227,7 +228,7 @@ table h3 { font-size: 1.167em; } table p { - margin: 0; + margin: 0; } table .name { @@ -342,13 +343,13 @@ color: #f6f6ed; } .title a:hover { color: #f6f6ed; } - + .or { color: #c0e07a; font-size: 3em; padding: 30px 20px; font-weight: bold; -} +} .fakeol { font-family: Georgia, "Times New Roman", Times, serif; @@ -379,12 +380,12 @@ #footer p, #footer ul { - font-size: 0.9em; + font-size: 0.9em; } #footer ul { padding-left: 0; list-style: none; -} +} #footer ul li { line-height: 18px; Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-06-11 01:57:39 UTC (rev 26213) +++ website/trunk/en/index.wml 2013-06-11 02:12:45 UTC (rev 26214) @@ -190,7 +190,7 @@ </tr> </table> </div> - <div id="torusers"> + <div id="home-users"> <h2>Who Uses Tor?</h2> <div class="fauxhead"></div> <div class="user">

1 0

r26213: {website} fix the header. (website/trunk/en)
by Andrew Lewman 11 Jun '13

11 Jun '13

Author: phobos Date: 2013-06-11 01:57:39 +0000 (Tue, 11 Jun 2013) New Revision: 26213 Modified: website/trunk/en/index.wml Log: fix the header. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-06-11 01:54:58 UTC (rev 26212) +++ website/trunk/en/index.wml 2013-06-11 01:57:39 UTC (rev 26213) @@ -155,7 +155,6 @@ <div id="sidecol"> <div id="home-announcements" class="clearfix"> <h2>Announcements</h2> - <div class="fauxhead"></div> <table> <tr> <td> @@ -193,6 +192,7 @@ </div> <div id="torusers"> <h2>Who Uses Tor?</h2> + <div class="fauxhead"></div> <div class="user"> <h3> <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" alt="Normal People">Family & Friends</a>

1 0

r26212: {website} swap announcements and tor use cases, add the latest blog po (website/trunk/en)
by Andrew Lewman 11 Jun '13

11 Jun '13

Author: phobos Date: 2013-06-11 01:54:58 +0000 (Tue, 11 Jun 2013) New Revision: 26212 Modified: website/trunk/en/index.wml Log: swap announcements and tor use cases, add the latest blog post to the announcements. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-06-10 14:39:54 UTC (rev 26211) +++ website/trunk/en/index.wml 2013-06-11 01:54:58 UTC (rev 26212) @@ -153,6 +153,44 @@ </div>  <div id="sidecol"> + <div id="home-announcements" class="clearfix"> + <h2>Announcements</h2> + <div class="fauxhead"></div> + <table> + <tr> + <td> + <div class="calendar"><span class="month">Jun</span><br><span class="day">10</span></div> + <p>Read our <a href="https://blog.torproject.org/blog/tors-response-prism-surveillance-program">response</a> to NSA PRISM and the Eric Snowden interview.</p> + </td> + </tr> + <tr> + <td> + <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div> + <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p> + </td> + </tr> + <tr> + <td> + <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div> + <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgia…">trip report about teaching + the Dutch and Belgian police about Tor</a>.</p> + </td> + </tr> + <tr> + <td> + <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div> + <p>Combined flashproxy and pyobfsproxy bundles now available. + See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-b…">the announcement</a> for details.</p> + </td> + </tr> + <tr> + <td> + <div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div> + <p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p> + </td> + </tr> + </table> + </div> <div id="torusers"> <h2>Who Uses Tor?</h2> <div class="user"> @@ -186,38 +224,6 @@ <p>Militaries and law enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p> </div> </div> - <div id="home-announcements" class="clearfix"> - <h2>Announcements</h2> - <div class="fauxhead"></div> - <table> - <tr> - <td> - <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div> - <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p> - </td> - </tr> - <tr> - <td> - <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div> - <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgia…">trip report about teaching - the Dutch and Belgian police about Tor</a>.</p> - </td> - </tr> - <tr> - <td> - <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div> - <p>Combined flashproxy and pyobfsproxy bundles now available. - See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-b…">the announcement</a> for details.</p> - </td> - </tr> - <tr> - <td> - <div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div> - <p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p> - </td> - </tr> - </table> - </div>  </div>

1 0

[torbrowser/master] fix 64-bit Linux TBB so that it doesn't crash anymore (closes: #8970)
by erinn＠torproject.org 11 Jun '13

11 Jun '13

commit 2e5148c0ba17e0be21b57560f556fd5c50ff62f6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jun 10 21:05:23 2013 -0300 fix 64-bit Linux TBB so that it doesn't crash anymore (closes: #8970) --- build-scripts/linux.mk | 2 +- changelog.linux-2.3 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8c5ef4e..fc195a8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Linux ## Build machine specific settings diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 6774803..55427d1 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-9); suite=linux + + * Rebuild 64-bit bundles with Firefox optimizations disabled in order to + prevent browser crashes. (closes: #8970) + + -- Erinn Clark <erinn(a)torproject.org> Mon Jun 10 21:02:22 BRT 2013 + Tor Browser Bundle (2.3.25-8); suite=linux * Update Firefox to 17.0.6esr

1 0

[torbrowser/maint-2.4] fix 64-bit Linux TBB so that it doesn't crash anymore (closes: #8970)
by erinn＠torproject.org 11 Jun '13

11 Jun '13

commit 2e5148c0ba17e0be21b57560f556fd5c50ff62f6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jun 10 21:05:23 2013 -0300 fix 64-bit Linux TBB so that it doesn't crash anymore (closes: #8970) --- build-scripts/linux.mk | 2 +- changelog.linux-2.3 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8c5ef4e..fc195a8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Linux ## Build machine specific settings diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 6774803..55427d1 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-9); suite=linux + + * Rebuild 64-bit bundles with Firefox optimizations disabled in order to + prevent browser crashes. (closes: #8970) + + -- Erinn Clark <erinn(a)torproject.org> Mon Jun 10 21:02:22 BRT 2013 + Tor Browser Bundle (2.3.25-8); suite=linux * Update Firefox to 17.0.6esr

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 11 Jun '13

11 Jun '13

commit 6b6942bbe9553e51f306d517f3e6367c5a189e7a Merge: 8661230 2e5148c Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jun 10 21:06:44 2013 -0300 Merge branch 'maint-2.4' build-scripts/linux.mk | 2 +- changelog.linux-2.3 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)

1 0