- tor-commits - lists.torproject.org

[gettor/master] Insert a dirty hack into MakeStat.py as long as we must keep
by kaner＠torproject.org 18 Sep '11

18 Sep '11

commit 56176f0babfb3623279b3dc0732e78e23a3e6e41 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Sep 12 20:07:17 2011 +0200 Insert a dirty hack into MakeStat.py as long as we must keep log files with old packages names around.. --- MakeStat.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/MakeStat.py b/MakeStat.py index f124370..24ceeaf 100644 --- a/MakeStat.py +++ b/MakeStat.py @@ -12,6 +12,7 @@ def makestats(filename, configPackages): # Initialize package counter packageCounter = { 'None': 0} + dateInfo = "" for k in configPackages.keys(): packageCounter[k] = 0 @@ -30,6 +31,21 @@ def makestats(filename, configPackages): reqInfo = ast.literal_eval(match.group(2)) package = reqInfo['package'] if package is not None: + match = re.match("tor-browser-bundle(_.*)", package) + if match: + package = "windows" + match.group(1) + match = re.match("linux-browser-bundle(-.*)", package) + if match: + package = "linux" + match.group(1) + match = re.match("(macosx-i386)(.*)", package) + if match: + package = "macosx-i386" + match = re.match("(macosx-ppc)(.*)", package) + if match: + package = "macosx-ppc" + match = re.match("windows-bundle", package) + if match: + continue packageCounter[package] += 1 else: packageCounter['None'] += 1

1 0

[gettor/master] Configuration file correction: s/macosx/macos/
by kaner＠torproject.org 18 Sep '11

18 Sep '11

commit ea20c37577818f64f00e37f056bcdb936a058457 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 18 21:27:41 2011 +0200 Configuration file correction: s/macosx/macos/ --- gettor.conf | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gettor.conf b/gettor.conf index 29a2494..56f8c35 100644 --- a/gettor.conf +++ b/gettor.conf @@ -95,46 +95,46 @@ PACKAGES = { "source": ("tor-*.tar.gz", "unavailable"), - "macosx-ppc": + "macos-ppc": ("vidalia-bundles/vidalia-bundle-*-ppc.dmg", "unavailable"), - "macosx-i386": + "macos-i386": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", "unavailable"), - "macosx-i386_en": + "macos-i386_en": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", "unavailable"), - "macosx-i386_ar": + "macos-i386_ar": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ar.zip", "unavailable"), - "macosx-i386_de": + "macos-i386_de": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-de.zip", "unavailable"), - "macosx-i386_es-ES": + "macos-i386_es-ES": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-es-ES.zip", "unavailable"), - "macosx-i386_fa": + "macos-i386_fa": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fa.zip", "unavailable"), - "macosx-i386_fr": + "macos-i386_fr": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fr.zip", "unavailable"), - "macosx-i386_it": + "macos-i386_it": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-it.zip", "unavailable"), - "macosx-i386_nl": + "macos-i386_nl": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-nl.zip", "unavailable"), - "macosx-i386_pl": + "macos-i386_pl": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pl.zip", "unavailable"), - "macosx-i386_pt": + "macos-i386_pt": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pt-PT.zip", "unavailable"), - "macosx-i386_ru": + "macos-i386_ru": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ru.zip", "unavailable"), - "macosx-i386_zh_CN": + "macos-i386_zh_CN": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-zh-CN.zip", "unavailable"), "linux-i386":

1 0

r25086: {website} actually really truly link to the vidalia foo bundle correct (website/trunk/include)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:50:03 +0000 (Sun, 18 Sep 2011) New Revision: 25086 Modified: website/trunk/include/versions.wmi Log: actually really truly link to the vidalia foo bundle correctly this time for sure! Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-18 15:37:57 UTC (rev 25085) +++ website/trunk/include/versions.wmi 2011-09-18 15:50:03 UTC (rev 25086) @@ -67,19 +67,19 @@ <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag>

1 0

r25085: {website} the windows bridge/exit/relay bundles were all pointing to h (website/trunk/download/en)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:37:57 +0000 (Sun, 18 Sep 2011) New Revision: 25085 Modified: website/trunk/download/en/download.wml Log: the windows bridge/exit/relay bundles were all pointing to https://www.torproject.org/dist/vidalia-bundles/vidalia-bundle-0.2.2.33-0.2… Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-18 15:36:21 UTC (rev 25084) +++ website/trunk/download/en/download.wml 2011-09-18 15:37:57 UTC (rev 25085) @@ -85,7 +85,7 @@  <div class="package"> <div class="downloads"> - <a class="button" href="<package-win32-relay-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> + <a class="button" href="<package-win32-relay-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> <div class="sig"> (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> @@ -99,7 +99,7 @@  <div class="package"> <div class="downloads"> - <a class="button" href="<package-win32-exit-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> + <a class="button" href="<package-win32-exit-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> <div class="sig"> (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div>

1 0

r25084: {website} the windows bridge/relay/exit bundle links were pointing at (website/trunk/include)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:36:21 +0000 (Sun, 18 Sep 2011) New Revision: 25084 Modified: website/trunk/include/versions.wmi Log: the windows bridge/relay/exit bundle links were pointing at the main bundle only Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-17 00:59:13 UTC (rev 25083) +++ website/trunk/include/versions.wmi 2011-09-18 15:36:21 UTC (rev 25084) @@ -68,19 +68,19 @@ <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> <define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> <define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> <define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag>

1 0

[metrics-web/master] Fix a typo.
by karsten＠torproject.org 17 Sep '11

17 Sep '11

commit d1a9d14a45c15c054e083ef57d50ab5d1deadfa6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Sep 17 20:22:22 2011 +0200 Fix a typo. --- web/WEB-INF/formats.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 0326d5b..31078c0 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -817,7 +817,7 @@ Tor Check makes the list of known exits and corresponding exit IP addresses available in a specific format. The document below shows an entry of the exit list written on December 28, 2010 at 15:21:44 UTC. -This entry means that the relay with fingerprint <tt>63Ba..</tt> which +This entry means that the relay with fingerprint <tt>63BA..</tt> which published a descriptor at 07:35:55 and was contained in a version 2 network status from 08:10:11 uses two different IP addresses for exiting. The first address <tt>91.102.152.236</tt> was found in a test performed at

1 0

r25083: {website} 2010 financial results are now available. Maybe someone will (in website/trunk/about: en findoc)
by Andrew Lewman 17 Sep '11

17 Sep '11

Author: phobos Date: 2011-09-17 00:59:13 +0000 (Sat, 17 Sep 2011) New Revision: 25083 Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc Modified: website/trunk/about/en/financials.wml Log: 2010 financial results are now available. Maybe someone will leak these public documents again. Modified: website/trunk/about/en/financials.wml =================================================================== --- website/trunk/about/en/financials.wml 2011-09-16 02:32:04 UTC (rev 25082) +++ website/trunk/about/en/financials.wml 2011-09-17 00:59:13 UTC (rev 25083) @@ -13,6 +13,8 @@ <div id="maincol"> <h1>Tor: Financial Reports</h1> <dl> + <dt>Fiscal Year 2010</dt> + <dd><a href="findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf">2010 IRS Form 990, State of MA Form PC, and Independent Audit Results</a></dd> <dt>Fiscal Year 2009</dt> <dd><a href="findoc/2009-TorProject-Annual-Report.pdf">2009 Annual Report</a></dd> <dd><a href="findoc/2009-TorProject-Form990andPC.pdf">2009 IRS Form 990 and State of MA Form PC</a></dd> Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc =================================================================== --- website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc (rev 0) +++ website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc 2011-09-17 00:59:13 UTC (rev 25083) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJOc+/xAAoJEM3X9rV07TNrlHcQAMBB1WLDi+uQwTGqcA/j68QB +uaF2ncd+IHKb1WCgvZi1FravA55yTZmTjXhE95iY1SZqLIzGabY3H1F+3d12lNLx +iPepQhXuBvumk0/+Ioc30W1ZOJxzimcuGCQ5hbqhyGAOZoFO7LHvp/tl1bZn6w8N +5D5kJedWGACoLCJIzSIM8xUUksaq5n3H8ERd/Z8qcnNAluCl5QDsdrnKj78q5fqp +l17sK8ZUi54fp0iccewSSme8Qfoe6uBtqEZDuBW+obd/283A8JKs9Q7qSLIdit9/ +KJOHbmwy6IrDnfd5aUpKWAr+ajAVhrt/p4Tr5wxqlBaFxvOGmCOWZppqnD7v38At +T40sX0jIsaXTLX90R7luZuNWdHkoBbN4Wpj8RfH6DXE/gsOb88Tb4m/D4Sr0XxTO +Di1KQG65ZUmFb9hpihJcE+xwh9SpzPHF3Yq1+NIem+iwHrNG5f3Ugon1rSzYHLmU +iKAETw+xiRExUwqFoVZgPb0iDLplcI9bKgzm8hAkUzctyTQaUkpovixgleqIkrHI +Ft2Q6TAXpi/pw4mCPiNnzzOgHcvwAUIoAR2iMrMthkZ61OSwHIFqDTTUfuNkRf67 +RTwi+8lVVmXXquJFjs30FDiWzISydfQZFiqFbO2cEdMi0xiGVsMK/zSZQwuqvqMh +PTQE1Q4mNB6AVQWwrTff +=O/R2 +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r25082: {website} fix the odd character encodings. (website/trunk/eff/en)
by Andrew Lewman 16 Sep '11

16 Sep '11

Author: phobos Date: 2011-09-16 02:32:04 +0000 (Fri, 16 Sep 2011) New Revision: 25082 Modified: website/trunk/eff/en/tor-dmca-response.wml Log: fix the odd character encodings. Modified: website/trunk/eff/en/tor-dmca-response.wml =================================================================== --- website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:26:27 UTC (rev 25081) +++ website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:32:04 UTC (rev 25082) @@ -14,7 +14,7 @@ <p>Note to Tor relay operators: In this litigious era, anyone providing routing services may face copyright complaints for transmitted content. Fortunately, the Digital Millennium Copyright Act safe harbors should -provide protections from many of them�both to you and to your upstream +provide protections from many of them both to you and to your upstream provider. If your Internet host forwards a DMCA copyright complaint to you, you can use this template to write a response, though you will need to customize it to your situation. Please also ensure all the statements @@ -56,7 +56,7 @@ run.</p> <p>As you know, the DMCA creates four "safe harbors" for service providers to protect them from copyright liability for the acts of their -users, when the ISPs fulfill certain requirements. (17 U.S.C. � 512) The +users, when the ISPs fulfill certain requirements. (17 U.S.C. § 512) The DMCA's requirements vary depending on the ISP's role. You may be familiar with the "notice and takedown" provisions of section 512(c) of the DMCA; however, those do not apply when an ISP merely acts as a @@ -80,7 +80,7 @@ terminates subscribers who are repeat infringers. The notification you received is certainly not proof of the "repeat infringement" that is required under the law before you need to terminate my account. In fact, -it�s not even proof of any copyright infringement; a notice claiming +it's not even proof of any copyright infringement; a notice claiming infringement is not the same as a determination of infringement. I have not infringed any copyrights and do not intend to do so. Therefore, you should continue to be protected under the DMCA 512(a) safe harbor

1 0

r25081: {website} remove the tor challenge link at the bottom, update the tor- (website/trunk/eff/en)
by Andrew Lewman 16 Sep '11

16 Sep '11

Author: phobos Date: 2011-09-16 02:26:27 +0000 (Fri, 16 Sep 2011) New Revision: 25081 Modified: website/trunk/eff/en/tor-dmca-response.wml website/trunk/eff/en/tor-legal-faq.wml Log: remove the tor challenge link at the bottom, update the tor-dmca-template to the shiny new one from eff. Modified: website/trunk/eff/en/tor-dmca-response.wml =================================================================== --- website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:21:22 UTC (rev 25080) +++ website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:26:27 UTC (rev 25081) @@ -7,124 +7,110 @@  -<h2>Response template for Tor relay maintainer to ISP</h2> +<h2>Response template for Tor relay operator to ISP</h2> <hr> -<p>Written by the Electronic Frontier -Foundation (<a href="http://www.eff.org/">EFF</a>). Last updated 19 Feb 2005.</p> - -<p>Note to Tor relay operators: In this litigous era, anyone -providing routing services may face copyright complaints under the -Digital Millennium Copyright Act. Thankfully, the DMCA safe harbors -provide immunity from many of them -- both to you and to your -upstream provider. If your Internet host forwards a DMCA complaint -to you, here's a template you can use to write a response. You can -tailor this to your own circumstances: if you think your host would -be disturbed to hear you're running a relay on the network, you may -want to take that part out. Of course it's up to you to comply with -your ISP's terms of service. If you're not comfortable including so -much legal explanation, feel free to invite the ISP to contact EFF -for a fuller discussion.</p> - +<p>Written by the Electronic Frontier Foundation (<a +href="https://www.eff.org">EFF</a>). Last updated May 31, 2011.</p> +<p>Note to Tor relay operators: In this litigious era, anyone providing +routing services may face copyright complaints for transmitted content. +Fortunately, the Digital Millennium Copyright Act safe harbors should +provide protections from many of them�both to you and to your upstream +provider. If your Internet host forwards a DMCA copyright complaint to +you, you can use this template to write a response, though you will need +to customize it to your situation. Please also ensure all the statements +are true for you. (The Tor Project has an <a +href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTempla…">abuse +collection of templates</a> to help you respond to other types of abuse +complaints, too.) Before sending any response to your ISP, you may want +to seek the advice of an attorney licensed to practice in your +jurisdiction.</p> <p>This template letter is for informational purposes only and does not constitute legal advice. Whether and how you should respond when you or -your ISP has received a DMCA notice will turn on the particular facts -of your situation. This template is intended as a starting point. Before -sending any response to your ISP, you may want to seek the advice of an -attorney licensed to practice in your jurisdiction.</p> +your ISP has received a DMCA notice will turn on the particular facts of +your situation. This template is intended as a starting point, but you +should tailor it to your own circumstances. In addition, it's up to you +to comply with your ISP's terms of service. If you're not comfortable +including so much legal explanation, feel free to invite the ISP to +contact EFF for a fuller discussion. </p> +<p>If you do not believe the safe harbors apply to your particular +situation, don't use this template as a basis for your response. +Specific information about safe harbor qualification for "transitory +digital network communications" is provided on the Chilling Effects +website <a +href="https://www.chillingeffects.org/dmca512/faq.cgi#QID586">here</a> +and also in the template, below.</p> -<p>Also, if you received this document from anywhere besides <a -href="https://torproject.org/eff/tor-dmca-response.html">https://www.torproject.org/eff/tor-dmca-response.html</a>, +<p>Also, if you received this document from anywhere other than the EFF +web site or <a +href="<page eff/tor-dmca-response>" +title="<page eff/tor-dmca-response>"><page eff/tor-dmca-response></a>, it may be out of date. Follow the link to get the latest version.</p> - -<hr> - -<p>Dear [ISP]:</p> - +<blockquote><p> +Dear [ISP]:</p> <p>Thank you for forwarding me the notice you received from [copyright -claimant] regarding [content]. I would like to assure you that, -contrary to the assertions in the notice, 1) I am not hosting or -making available the claimed infringing materials, and 2) you are -already protected by the Digital Millennium Copyright Act's ("DMCA") -safe harbor from any liability arising from this complaint. The -notice is incorrect, probably based upon misunderstandings about law -and about some of the software I run. -</p> - -<p> -First, in terms of legal liability, this notice does not create any -risk for you as a service provider. As you know, the DMCA creates -four "safe harbors" for service providers to protect them from -copyright liability for the acts of their users, when the ISPs -fulfill certain requirements. (17 U.S.C. � 512) The DMCA's -requirements vary depending on the ISP's role. You may be most -familiar with the "notice and takedown" provisions of DMCA 512(c), -but those apply only to content hosted on your servers, or to linking -and caching activity. The "takedown notice" provisions do not apply -when an ISP merely acts as a conduit. Instead, the "conduit" safe -harbor of DMCA 512(a) has different and less burdensome requirements, -as the D.C. Circuit Court of Appeals held in RIAA v. Verizon (see -<a href="http://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf">http://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf</a>) +claimant] regarding [content]. I would like to assure you that I am not +hosting the claimed infringing materials, and furthermore, the Digital +Millennium Copyright Act's ("DMCA") safe harbors likely protect you from +liability arising from this complaint. The notice is likely based upon +misunderstandings about the law and about some of the software I +run.</p> +<p>As you know, the DMCA creates four "safe harbors" for service +providers to protect them from copyright liability for the acts of their +users, when the ISPs fulfill certain requirements. (17 U.S.C. � 512) The +DMCA's requirements vary depending on the ISP's role. You may be +familiar with the "notice and takedown" provisions of section 512(c) of +the DMCA; however, those do not apply when an ISP merely acts as a +conduit. Instead, the "conduit" safe harbor of section 512(a) of the +DMCA has different and less burdensome eligibility requirements, as the +D.C. Circuit Court of Appeals held in RIAA v. Verizon (see <a +href="https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf" +title="https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf">https://www.eff.org/legal/cases/RIAA_v_Verizon/opinion-20031219.pdf</a>) and the Eighth Circuit Court of Appeals confirmed in RIAA v. Charter -(see <a href="http://www.eff.org/IP/P2P/Charter/033802P.pdf">http://www.eff.org/IP/P2P/Charter/033802P.pdf</a>). -</p> +(see <a href="https://w2.eff.org/IP/P2P/Charter/033802P.pdf" +title="https://w2.eff.org/IP/P2P/Charter/033802P.pdf">https://w2.eff.org/IP/P2P/Charter/033802P.pdf</a>).</p> +<p>Under DMCA 512(a), service providers like you are typically protected +from damages for copyright infringement claims if you also maintain "a +policy that provides for termination in appropriate circumstances of +subscribers and account holders of the service provider's system or +network who are repeat infringers." If you have and implement such a +policy, and you otherwise qualify for the safe harbor, you should be +free from fear of copyright damages.</p> -<p> -Here, any content that came from or through my computers merely -passed through your network, so DMCA 512(a) applies. Under DMCA -512(a), you are immune from money damages for copyright infringement -claims if you maintain "a policy that provides for termination in -appropriate circumstances of subscribers and account holders of the -service provider's system or network who are repeat infringers." If -you have and implement such a policy, you are free from fear of -copyright damages, period. -</p> - -<p> -As for what makes a reasonable policy, as the law says, it's one that -only terminates subscribers who are repeat infringers. A notice -claiming infringement is not the same as a determination of -infringement. The notification you received is not proof of any -copyright infringement, and it certainly is not proof of the "repeat -infringement" that is required under the law before you need to -terminate my account. I have not infringed any copyrights and do not -intend to do so. Therefore, you continue to be protected under the -DMCA 512(a) safe harbor, without taking any further action. -</p> - -<p> -You might be curious, though, about what did trigger the notice. The -software that likely triggered the faulty notice is a program I run -called Tor. Tor is network software that helps users to enhance -their privacy, security, and safety online. It does not host or make -available any content. Rather, it is part of a network of nodes on -the Internet that simply pass packets among themselves before sending -them to their destinations, just as any Internet host does. The +<p>As for what makes a reasonable policy, as the law says, it's one that +terminates subscribers who are repeat infringers. The notification you +received is certainly not proof of the "repeat infringement" that is +required under the law before you need to terminate my account. In fact, +it�s not even proof of any copyright infringement; a notice claiming +infringement is not the same as a determination of infringement. I have +not infringed any copyrights and do not intend to do so. Therefore, you +should continue to be protected under the DMCA 512(a) safe harbor +without taking any further action. </p> +<p>You may be curious about what prompted the faulty notice. It was +likely triggered by a program I run called Tor. Tor is network software +that helps users to enhance their privacy, security, and safety online. +It does not host any content. Rather, it is part of a network of nodes +on the Internet that simply pass packets among themselves before sending +them to their destinations, just as any Internet intermediary does. The difference is that Tor tunnels the connections such that no hop can learn both the source and destination of the packets, giving users -protection from nefarious snooping on network traffic. Tor protects +protection from nefarious snooping on network traffic. The result is +that, unlike most other Internet traffic, the final IP address that the +recipient receives is not the IP address of the sender. Tor protects users against hazards such as harassment, spam, and identity theft. -In fact, initial development of Tor, including deployment of a -public-use Tor network, was a project of the U.S. Naval Research -Laboratory, with funding from ONR and DARPA. (For more on Tor, -see <a -href="https://www.torproject.org/">https://www.torproject.org/</a>.) -As an organization committed to -protecting the privacy of its customers, I hope you'll agree that -this is a valuable technology. -</p> - -<p> -Thank you for working with me on this matter. As a loyal subscriber, +Initial development of Tor, including deployment of a public-use Tor +network, was a project of the U.S. Naval Research Laboratory, with +funding from ONR and DARPA. (For more on Tor, see <a +href="https://www.torproject.org/" +title="https://www.torproject.org/">https://www.torproject.org/</a>.) I +hope, as an organization committed to protecting the privacy of its +customers, you'll agree that this is a valuable technology. </p> +<p>Thank you for working with me on this matter. As a loyal subscriber, I appreciate your notifying me of this issue and hope that the -complete protections of DMCA 512 put any concerns you may have at -rest. If not, please contact me with any further questions. -</p> +protections of DMCA 512 put any concerns you may have to rest. If not, +please contact me with any further questions. </p> +<p>Very truly yours,<br /> +Your customer, [User]</p></blockquote> -<p> -Very truly yours,<br> -Your customer, [User] -</p> - </div> #include <foot.wmi> Modified: website/trunk/eff/en/tor-legal-faq.wml =================================================================== --- website/trunk/eff/en/tor-legal-faq.wml 2011-09-16 02:21:22 UTC (rev 25080) +++ website/trunk/eff/en/tor-legal-faq.wml 2011-09-16 02:26:27 UTC (rev 25081) @@ -216,10 +216,7 @@ providers, EFF is interested in hearing from you. Read more <a href="https://lists.torproject.org/pipermail/tor-talk/2005-October/016301.html">here</a> about being EFF's test case.</p> -<p><a href=https://www.eff.org/torchallenge/setting-up/>» Set up a Tor -Relay now!</a></p> - </div> #include <foot.wmi>

1 0

r25080: {website} point to the correct dmca response template. (website/trunk/eff/en)
by Andrew Lewman 16 Sep '11

16 Sep '11

Author: phobos Date: 2011-09-16 02:21:22 +0000 (Fri, 16 Sep 2011) New Revision: 25080 Modified: website/trunk/eff/en/tor-legal-faq.wml Log: point to the correct dmca response template. Modified: website/trunk/eff/en/tor-legal-faq.wml =================================================================== --- website/trunk/eff/en/tor-legal-faq.wml 2011-09-16 02:19:31 UTC (rev 25079) +++ website/trunk/eff/en/tor-legal-faq.wml 2011-09-16 02:21:22 UTC (rev 25080) @@ -25,7 +25,7 @@ href="<page eff/tor-legal-faq>">https://www.torproject.org/eff/tor-legal-faq.html</a>, it may be out of date. Follow the link to get the latest version.</p> <p>Got a DMCA notice? Check out our <a -href="<page eff/dmca-template>">sample response +href="<page eff/tor-dmca-response>">sample response letter!</a></p> <h2>General Information</h2> <p><b>Has anyone ever been sued or prosecuted for running Tor?</b></p> @@ -189,7 +189,7 @@ <p><b>My ISP, university, etc. just sent me a DMCA notice. What should I do?</b></p> <p>EFF has written a <a -href="<page eff/dmca-template>">short template</a> to help +href="<page eff/tor-dmca-response>">short template</a> to help you write a response to your ISP, university, etc., to let them know about the details of the Digital Millennium Copyright Act’s safe harbor, and how Tor fits in. Note that template only refers to U.S.

1 0