- tor-commits - lists.torproject.org

[collector/master] cobertura.ser needs to be in basedir in order to calculate coverage correctly.
by karsten＠torproject.org 24 May '16

24 May '16

commit 79653eb97741b8a65a12ad42d59760a93aab5946 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu May 19 17:23:21 2016 +0200 cobertura.ser needs to be in basedir in order to calculate coverage correctly. --- build.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 14223a9..2acaa26 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,7 @@ <property name="testclasses" value="${generated}/testclasses/"/> <property name="docs" value="${generated}/javadoc/"/> <property name="libs" value="lib"/> - <property name="cobertura.ser.file" value="${generated}/cobertura.ser" /> + <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> <property name="jarfile" value="collector-${release.version}.jar" /> <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" /> <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" /> @@ -71,6 +71,7 @@ <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${generated}" defaultexcludes="false" includes="**" /> </delete> + <delete file="${cobertura.ser.file}" quiet="true"/> <delete file="${jarfile}" quiet="true"/> <delete file="${jarsourcesfile}" quiet="true"/> <delete file="${jarjavadocfile}" quiet="true"/> @@ -179,7 +180,7 @@ </cobertura-instrument> <junit fork="true" haltonfailure="false" printsummary="on"> <sysproperty key="net.sourceforge.cobertura.datafile" - file="${basedir}/${cobertura.ser.file}" /> + file="${cobertura.ser.file}" /> <classpath location="${instrument}" /> <classpath refid="classpath" /> <classpath refid="test.classpath" />

1 0

[collector/master] Add Javadoc titles, usage info, and footer.
by karsten＠torproject.org 24 May '16

24 May '16

commit a91e320bc5c9863c421dee3d214c710d868c0cfb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 24 20:32:53 2016 +0200 Add Javadoc titles, usage info, and footer. Suggested by iwakeh on #18733. --- build.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 2acaa26..10c5edd 100644 --- a/build.xml +++ b/build.xml @@ -105,7 +105,11 @@ </target> <target name="docs"> <mkdir dir="${docs}"/> - <javadoc destdir="${docs}"> + <javadoc destdir="${docs}" + footer="&copy; 2016 The Tor Project" + doctitle="CollecTor Documentation" + use="true" + windowtitle="CollecTor Documentation"> <classpath refid="classpath"/> <fileset dir="${sources}/" includes="**/*.java" /> </javadoc>

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 24 May '16

24 May '16

commit 464f9221b09b70e05950a44ebb4f3c1f0bfde179 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 19 22:58:18 2016 -0700 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party --- dom/base/nsXMLHttpRequest.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dom/base/nsXMLHttpRequest.cpp b/dom/base/nsXMLHttpRequest.cpp index 2c68e65..9d1ead5 100644 --- a/dom/base/nsXMLHttpRequest.cpp +++ b/dom/base/nsXMLHttpRequest.cpp @@ -1697,8 +1697,13 @@ nsXMLHttpRequest::Open(const nsACString& inMethod, const nsACString& url, // If we have the document, use it. Unfortunately, for dedicated workers // 'doc' ends up being the parent document, which is not the document - // that we want to use. So make sure to avoid using 'doc' in that situation. - if (doc && doc->NodePrincipal() == mPrincipal) { + // that we want to use because it has the wrong Content Security Policy. + // So make sure to avoid using 'doc' in that situation. + // However, for blob urls, we don't care about CSP but we do need to + // pass on the parent document to get the correct first party. + bool isBlob = false; + if (doc && (doc->NodePrincipal() == mPrincipal || + (NS_SUCCEEDED(uri->SchemeIs("blob", &isBlob)) && isBlob))) { rv = NS_NewChannel(getter_AddRefs(mChannel), uri, doc,

1 0

[torbutton/master] Bug 17599: Provide shortcuts for New Identity and New Circuit
by gk＠torproject.org 24 May '16

24 May '16

commit e546a3f158b6fc39c66e323eaa7b8463caef599c Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 24 13:05:16 2016 +0000 Bug 17599: Provide shortcuts for New Identity and New Circuit Thanks to cpwc for the patch. --- src/chrome/content/popup.xul | 2 ++ src/chrome/content/torbutton.xul | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 6511b6c..d015766 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -19,11 +19,13 @@ <menuitem id="torbutton-new-identity" label="&torbutton.context_menu.new_identity;" accesskey="&torbutton.context_menu.new_identity_key;" + key="torbutton-new-identity-key" insertafter="context-stop" oncommand="torbutton_new_identity()"/> <menuitem id="torbutton-new-circuit" label="&torbutton.context_menu.new_circuit;" accesskey="&torbutton.context_menu.new_circuit_key;" + key="torbutton-new-circuit-key" insertafter="context-stop" oncommand="torbutton_new_circuit()"/> <menuseparator/> diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index a9d60f6..df86370 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -45,4 +45,10 @@ context="torbutton-context-menu" />  </statusbar> + + + <keyset> + <key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/> + <key id="torbutton-new-circuit-key" modifiers="accel shift" key="L" oncommand="torbutton_new_circuit()"/> + </keyset> </overlay>

1 0

[webwml/master] make the address more readable
by arma＠torproject.org 23 May '16

23 May '16

commit 74c061091b8dc6e11d7d2d2f401b2a7da31c5715 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 23 15:30:51 2016 -0400 make the address more readable --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index ef06aad..d3a93e6 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -110,7 +110,7 @@ address is:</p> <address>The Tor Project<br> 217 1st Ave South #4903<br> -Seattle, WA 98194 USA +Seattle, WA 98194 USA<br><br> </address> <a id="security"></a>

1 0

[webwml/master] simplify the top of the core people page even more
by arma＠torproject.org 23 May '16

23 May '16

commit c4c9d9257b4edae40985fa1ea8875b28b6964384 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 23 14:45:26 2016 -0400 simplify the top of the core people page even more --- about/en/corepeople.wml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index b9ff1f4..0427c22 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -9,11 +9,6 @@ <a href="<page about/corepeople>">Tor People</a> </div> <div id="maincol"> - <p>The Tor Project is a 501(c)(3) non-profit based in - the United States. The official address of the organization is - listed on the <a href="<page about/contact>#mail">contact page</a>. - </p> - <p>The organization consists of many volunteers and a few employees. Please don't contact us individually about Tor topics — if you have a problem or question, please look through the <a href="<page

1 0

[webwml/master] change our postal address in the two remaining places
by arma＠torproject.org 23 May '16

23 May '16

commit ba780b8c67d9ce8ddc6ff5a2b1c7501c562d6ce3 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 23 14:44:55 2016 -0400 change our postal address in the two remaining places --- about/en/contact.wml | 12 ++++++------ donate/en/donate-options.wml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 277ea9f..ef06aad 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -106,12 +106,12 @@ <a id="mail"></a> <h3><a class="anchor" href="#mail">Mailing Address</a></h3> - <p>Should you need to reach us via old reliable mail, our mailing - address is: - <p>The Tor Project, Inc<br> - 7 Temple Street, Suite A<br> - Cambridge, MA 02139-2403 USA</p> - </p> + <p>Should you need to reach us via old-fashioned mail, our mailing + address is:</p> +<address>The Tor Project<br> +217 1st Ave South #4903<br> +Seattle, WA 98194 USA +</address> <a id="security"></a> <h3><a class="anchor" href="#security">Security Issues</a></h3> diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 6ba2e3b..57e0806 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -182,9 +182,9 @@ exchange money quickly, safely, at a lower cost.</p> <div class="dbox donate"> <h3>Donate via Check or Money Order</h3> <h4>You can send checks or money orders to:</h4> - <p>The Tor Project, Inc<br> - 7 Temple Street, Suite A<br> - Cambridge, MA 02139-2403 USA</p> + <p>The Tor Project, Inc<br> + 217 1st Ave South #4903<br> + Seattle, WA 98194 USA</p> </div> </div>

1 0

[webwml/master] remove our postal address from two pages
by arma＠torproject.org 23 May '16

23 May '16

commit 7086384121abe10e348c409a18efc1bd5b849a2d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 23 14:44:23 2016 -0400 remove our postal address from two pages now it's easier to change it --- about/en/corepeople.wml | 9 ++------- donate/en/donor-faq.wml | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index ec0afbd..b9ff1f4 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -10,15 +10,10 @@ </div> <div id="maincol"> <p>The Tor Project is a 501(c)(3) non-profit based in - the United States. The official address of the organization is: + the United States. The official address of the organization is + listed on the <a href="<page about/contact>#mail">contact page</a>. </p> - <address> - The Tor Project<br> - 7 Temple Street, Suite A<br> - Cambridge, MA 02139-2403 USA<br><br> - </address> - <p>The organization consists of many volunteers and a few employees. Please don't contact us individually about Tor topics — if you have a problem or question, please look through the <a href="<page diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index c6816ad..0b95e8c 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -258,9 +258,9 @@ <li> <p><strong>If I want my donation to be anonymous, what is the best way for me to donate?</strong></p> - <p>You can donate by mailing cash to the Tor Project. Our - address is The Tor Project, Inc., 7 Temple Street Suite A, - Cambridge MA 02139-2403 USA. You can donate via bitcoin + <p>You can donate by <a href="<page + donate/donate-options>#cash">mailing cash</a>. + You can donate via bitcoin if you have bitcoin set up in a way that preserves your anonymity. You can buy cash gift cards and mail them to us. There are probably other ways to donate anonymously that

1 0

[tor/master] Do not ignore files that are being tracked by git
by nickm＠torproject.org 23 May '16

23 May '16

commit 87134db57cc7cbbd801e5992ce6ca6a71e2ebfc8 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Apr 6 12:16:04 2016 +0000 Do not ignore files that are being tracked by git --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index b141e80..f304a32 100644 --- a/.gitignore +++ b/.gitignore @@ -189,9 +189,6 @@ uptime-*.json /src/test/test-memwipe.exe /src/test/test-switch-id.exe /src/test/test_workqueue.exe -/src/test/test_zero_length_keys.sh -/src/test/test_ntor.sh -/src/test/test_bt.sh # /src/tools/ /src/tools/tor-checkkey

1 0

[tor/release-0.2.8] Do not ignore files that are being tracked by git
by nickm＠torproject.org 23 May '16

23 May '16

commit 87134db57cc7cbbd801e5992ce6ca6a71e2ebfc8 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Apr 6 12:16:04 2016 +0000 Do not ignore files that are being tracked by git --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index b141e80..f304a32 100644 --- a/.gitignore +++ b/.gitignore @@ -189,9 +189,6 @@ uptime-*.json /src/test/test-memwipe.exe /src/test/test-switch-id.exe /src/test/test_workqueue.exe -/src/test/test_zero_length_keys.sh -/src/test/test_ntor.sh -/src/test/test_bt.sh # /src/tools/ /src/tools/tor-checkkey

1 0