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

[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

[torbrowser/maint-2.3] 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