December 2012 - tor-commits - lists.torproject.org

r25937: {website} update mirrors. (website/trunk/include)
by Andrew Lewman 11 Dec '12

11 Dec '12

Author: phobos Date: 2012-12-11 15:05:07 +0000 (Tue, 11 Dec 2012) New Revision: 25937 Modified: website/trunk/include/mirrors-table.wmi Log: update mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-12-06 16:24:23 UTC (rev 25936) +++ website/trunk/include/mirrors-table.wmi 2012-12-11 15:05:07 UTC (rev 25937) @@ -20,6 +20,57 @@ <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>Quintex</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tormirror.quintex.com/dist/">http</a></td> + <td><a href="http://tormirror.quintex.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>PT</td> + + <td>5ª Coluna</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td>CCC</td> <td>Up to date</td> @@ -52,6 +103,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -188,23 +256,6 @@ <tr> - <td>DE</td> - - <td>crazyhaze.de</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>RO</td> <td>me0w.cc</td> @@ -239,6 +290,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -358,23 +426,6 @@ <tr> - <td>DE</td> - - <td>factor.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td></td> @@ -528,6 +579,23 @@ <tr> + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>LazyTiger</td> @@ -617,7 +685,7 @@ <td>[[:bbs:]]</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> @@ -630,32 +698,15 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td></td> + <td>hessmo</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -664,32 +715,32 @@ <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td>crazyhaze.de</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>IN</td> - <td>Amorphis</td> + <td>India Tor Fans</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -698,15 +749,15 @@ <tr> - <td>LT</td> + <td>DE</td> <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -717,13 +768,13 @@ <td>US</td> - <td>AskApache</td> + <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,15 +783,15 @@ <tr> - <td>US</td> + <td>CZ</td> - <td>hessmo</td> + <td>Lightning-bolt.net</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -749,15 +800,15 @@ <tr> - <td>US</td> + <td>NL</td> - <td>searchprivate</td> + <td>BIT BV</td> - <td>Out of date</td> + <td>Unknown</td> + <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> + <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -766,49 +817,32 @@ <tr> - <td>IN</td> + <td>AT</td> - <td>India Tor Fans</td> + <td>FoDT</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> + <td><a href="http://tor.fodt.co.at/dist/">http</a></td> + <td><a href="http://tor.fodt.co.at/">http</a></td> + <td><a href="https://tor.fodt.co.at/dist/">https</a></td> + <td><a href="https://tor.fodt.co.at/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>UA</td> <td></td> - <td>Out of date</td> - - <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>CZ</td> - - <td>Lightning-bolt.net</td> - <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -819,13 +853,13 @@ <td>US</td> - <td>Quintex</td> + <td>searchprivate</td> <td>Unknown</td> <td> - </td> - <td><a href="http://tormirror.quintex.com/dist/">http</a></td> - <td><a href="http://tormirror.quintex.com/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -834,32 +868,32 @@ <tr> - <td>PT</td> + <td>DE</td> - <td>5ª Coluna</td> + <td>factor.cc</td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> - <td>BIT BV</td> + <td></td> <td>Unknown</td> - <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> - <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> + <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -868,49 +902,32 @@ <tr> - <td>AT</td> + <td>NL</td> - <td>FoDT</td> + <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.fodt.co.at/dist/">http</a></td> - <td><a href="http://tor.fodt.co.at/">http</a></td> - <td><a href="https://tor.fodt.co.at/dist/">https</a></td> - <td><a href="https://tor.fodt.co.at/">https</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>UA</td> - - <td></td> - - <td>Unknown</td> - + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> - <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -926,27 +943,10 @@ <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> <td> - </td> </tr> - -<tr> - - <td>NL</td> - - <td></td> - - <td>Out of date</td> - - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr>

1 0

[atlas/master] Avoid confusion caused by collapsing navbar.
by karsten＠torproject.org 11 Dec '12

11 Dec '12

commit 96d1854b09cc2ceed4019938e468708eaf6a2cac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 10:07:27 2012 +0100 Avoid confusion caused by collapsing navbar. On smaller screens, the navbar collapses to a single button. This collapsing includes the search field, which (understandably) confuses users. Remove both "Home" and "About" button and move search field to non-collapsing part of the navbar. Fixes #6945. --- index.html | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index ffd4be1..5ab6ba1 100644 --- a/index.html +++ b/index.html @@ -35,21 +35,10 @@ <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> <a class="brand" href="#"><img src="img/TorStatus.png"/></a> - <div class="nav-collapse"> - <ul class="nav"> - <li id="home" class="active"><a href="#">Home</a></li> - <li id="about" ><a href="#about">About</a></li> - </ul> <form id="nav-search" class="navbar-search pull-left" action> - <input type="text" class="search-query span2" placeholder="Search"> + <input type="text" class="search-query" placeholder="Search"> </form> - </div> </div> </div> </div> @@ -63,6 +52,7 @@ <hr/> <footer> The Tor Project - 2012<br/> + <a href="#about">About</a> - <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> - <a href="mailto:art@torproject.org">Contact</a>

1 0

[onionoo/master] Don't generate invalid JSON documents.
by karsten＠torproject.org 11 Dec '12

11 Dec '12

commit 64141ebf1bd5445a0f746cb598c867ace067c9df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Dec 11 13:11:05 2012 +0100 Don't generate invalid JSON documents. Fixes #7701, found by hellais. --- src/org/torproject/onionoo/DetailDataWriter.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 7d0ab15..d681958 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -607,10 +607,10 @@ public class DetailDataWriter { } sb.append(",\n\"last_seen\":\"" + lastSeen + "\""); sb.append(",\n\"first_seen\":\"" + firstSeen + "\""); - sb.append(",\n\"running\":" + running + ",\n"); + sb.append(",\n\"running\":" + running); SortedSet<String> relayFlags = entry.getRelayFlags(); if (!relayFlags.isEmpty()) { - sb.append("\"flags\":["); + sb.append(",\n\"flags\":["); int written = 0; for (String relayFlag : relayFlags) { sb.append((written++ > 0 ? "," : "") + "\"" + relayFlag + "\""); @@ -847,11 +847,11 @@ public class DetailDataWriter { + "\"hashed_fingerprint\":\"" + fingerprint + "\",\n" + "\"or_addresses\":[" + orAddressesAndPortsBuilder.toString() + "],\n\"last_seen\":\"" + lastSeen + "\",\n\"first_seen\":\"" - + firstSeen + "\",\n\"running\":" + running + ","); + + firstSeen + "\",\n\"running\":" + running); SortedSet<String> relayFlags = entry.getRelayFlags(); if (!relayFlags.isEmpty()) { - sb.append("\n\"flags\":["); + sb.append(",\n\"flags\":["); int written = 0; for (String relayFlag : relayFlags) { sb.append((written++ > 0 ? "," : "") + "\"" + relayFlag + "\"");

1 0

[ooni-probe/master] Clean up HTTP Header Field Manipulation test documentation
by art＠torproject.org 11 Dec '12

11 Dec '12

commit 9212cbabcfc297564d886ddc5b884833a4c8dd30 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Dec 11 11:45:16 2012 +0100 Clean up HTTP Header Field Manipulation test documentation --- .../tests/http_header_field_manipulation.rst | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/source/tests/http_header_field_manipulation.rst b/docs/source/tests/http_header_field_manipulation.rst index 92bd0a4..328d497 100644 --- a/docs/source/tests/http_header_field_manipulation.rst +++ b/docs/source/tests/http_header_field_manipulation.rst @@ -7,20 +7,17 @@ Details *NetTest*: HTTPHeaderFieldManipulation (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) -*Test Helper*: SimpleHTTPChannel (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…) +*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…) *Test Type*: Traffic Manipulation *Requires Root*: No -*WARNING*: This test is more dangerous to run than any other one and you -should do it only if you know what you are doing. - Description =========== It performes HTTP requests with request headers that vary capitalization -towards a SimpleHTTPChannel test helper backend. If we detect that the -headers the backend received matches the ones we have sent then we have +towards a HTTPReturnJSONHeaders test helper backend. If we detect that the +headers the backend received don't matche the ones we have sent then we have detected tampering. How to run the test

1 0

[flashproxy/master] Make a comment more specific.
by dcf＠torproject.org 11 Dec '12

11 Dec '12

commit d9b004e25665fb7130163689c391bd630623f925 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 10 23:09:51 2012 -0800 Make a comment more specific. --- flashproxy-client.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy-client.spec b/flashproxy-client.spec index dbcde2f..aa020db 100644 --- a/flashproxy-client.spec +++ b/flashproxy-client.spec @@ -5,7 +5,7 @@ tmpdir = os.environ['PYINSTALLER_TMPDIR'] scripts = ('flashproxy-client', 'flashproxy-reg-email', 'flashproxy-reg-http') -# M2Crypto is listed as hidden import so PyInstaller fails if it cannot find it. +# M2Crypto is a hidden import so that PyInstaller will print an error if the module is missing. analyses = [(Analysis([script], hiddenimports=['M2Crypto']), script, os.path.join(tmpdir, 'build', script + '.exe')) for script in scripts]

1 0

[flashproxy/master] Remove execute bit from LICENSE.PYTHON.
by dcf＠torproject.org 11 Dec '12

11 Dec '12

commit c9a1db0205a25c4a3befcd8f5daa88fd51682e65 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 10 23:07:59 2012 -0800 Remove execute bit from LICENSE.PYTHON. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/LICENSE.PYTHON b/doc/LICENSE.PYTHON old mode 100755 new mode 100644

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit 46458e2afde2d5ae043d1bcca7f9180a5dc987d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 21:46:00 2012 +0000 Update translations for torbirdy --- ru/torbirdy.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties index f22e5a9..6166080 100644 --- a/ru/torbirdy.properties +++ b/ru/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=Пожалуйста, обратите внимание, torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз torbirdy.email.advanced.title=TorBirdy расширенные настройки -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Для установки временной зоны нажмите close и запустите ещё раз.

1 0

[torbrowser/master] use the right changelogs. closes #7668.
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit d986c08f7a86b87b9fcf99030418224c153ddb7b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:06:40 2012 +0000 use the right changelogs. closes #7668. --- build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..0a1490e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -271,9 +271,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..652f92a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -262,9 +262,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.3 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d3efa35..3dbe2be 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.3 $(DOCSDIR)/changelog + cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit b2e32f48ed60e38c64c8f65d1a3e8b3ad7fd08a3 Merge: cd8ddac d986c08 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:07:05 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

1 0

[torbrowser/maint-2.4] use the right changelogs. closes #7668.
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit d986c08f7a86b87b9fcf99030418224c153ddb7b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:06:40 2012 +0000 use the right changelogs. closes #7668. --- build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..0a1490e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -271,9 +271,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..652f92a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -262,9 +262,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.3 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d3efa35..3dbe2be 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.3 $(DOCSDIR)/changelog + cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0