November 2016 - tor-commits - lists.torproject.org

[onionoo/master] Part of task-19259 implementation.
by karsten＠torproject.org 17 Nov '16

17 Nov '16

commit c54a3f7f3f603a7f11b46b606405e8c411c8f299 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Nov 16 15:03:48 2016 +0100 Part of task-19259 implementation. Make test for old-style weight status docs pass. --- src/main/java/org/torproject/onionoo/docs/WeightsStatus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java index ce8d915..50b8b35 100644 --- a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java @@ -106,7 +106,8 @@ public class WeightsStatus extends Document { } private double parseWeightDouble(String in) throws NumberFormatException { - return in.isEmpty() ? Double.NaN : Double.parseDouble(in); + return in.isEmpty() || in.startsWith("-") + ? Double.NaN : Double.parseDouble(in); } /** Adds all given weights history objects that don't overlap with

1 0

[onionoo/master] Part of task-19259 implementation.
by karsten＠torproject.org 17 Nov '16

17 Nov '16

commit 545f19c922990eeddcdaaee3bbaf9f8be9fbd3bc Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Nov 16 15:02:00 2016 +0100 Part of task-19259 implementation. Added test for accomodating old-style documents, i.e. those using -1.00000000 for missing values. --- .../torproject/onionoo/docs/WeightsStatusTest.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java b/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java index 501cceb..3dc82f8 100644 --- a/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java +++ b/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java @@ -217,5 +217,43 @@ public class WeightsStatusTest { } } + private static final String[] oldStyle = new String[]{ + "2015-06-01 00:00:00 2015-06-01 12:00:00 0.000883231558 " + + "-1.000000000000 -1.000000000000 -1.000000000000 30500.000000000000\n", + "2015-05-31 13:00:00 2015-05-31 16:00:00 0.000023372492 " + + "-1.000000000000 -1.000000000000 -1.000000000000 778.000000000000\n", + "2014-07-04 22:00:00 2014-07-04 23:00:00 -1.000000000000 " + + "0.000140201280 0.000025070287 0.000025063393 0.000370501851 " + + "-1.000000000000 3210.000000000000\n", + "2014-07-08 19:00:00 2014-07-08 20:00:00 -1.000000000000 0.000000285817" + + " 0.000000000000 0.000000857371 0.000000000000 -1.000000000000 " + + "6.000000000000\n", + "2013-09-29 07:00:00 2013-09-29 08:00:00 -1.000000000000 0.000000844333 " + + "0.000000000000 0.000002532788 0.000000000000 -1.000000000000 " + + "11.000000000000\n" + }; + + private static final String[] newStyle = new String[]{ + "2015-06-01 00:00:00 2015-06-01 12:00:00 0.000883231558 " + + " 30500.000000000000\n", + "2015-05-31 13:00:00 2015-05-31 16:00:00 0.000023372492 " + + " 778.000000000000\n", + "2014-07-04 22:00:00 2014-07-04 23:00:00 0.000140201280 " + + "0.000025070287 0.000025063393 0.000370501851 3210.000000000000\n", + "2014-07-08 19:00:00 2014-07-08 20:00:00 0.000000285817" + + " 0.000000000000 0.000000857371 0.000000000000 6.000000000000\n", + "2013-09-29 07:00:00 2013-09-29 08:00:00 0.000000844333 " + + "0.000000000000 0.000002532788 0.000000000000 11.000000000000\n" + }; + + @Test() + public void testOlderFormat() { + for (int i = 0; i < newStyle.length; i++) { + WeightsStatus ws = new WeightsStatus(); + ws.setFromDocumentString(oldStyle[i]); + assertEquals("Expected\n" + newStyle[i] + "\nbut received\n" + + ws.toDocumentString(), newStyle[i], ws.toDocumentString()); + } + } }

1 0

[onionoo/master] Remove git-submodule.
by karsten＠torproject.org 17 Nov '16

17 Nov '16

commit a6c1fb0c53f03cf653da997cd324697070dbdfb3 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Nov 15 11:23:07 2016 +0100 Remove git-submodule. --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c6b6388..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "deps/metrics-lib"] - path = deps/metrics-lib - url = https://git.torproject.org/metrics-lib

1 0

[onionoo/master] Added tests for task-19259.
by karsten＠torproject.org 17 Nov '16

17 Nov '16

commit df79363d5834de4557a15ab9809afbac3f1fa1ba Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Nov 15 11:25:03 2016 +0100 Added tests for task-19259. --- .../torproject/onionoo/docs/WeightsStatusTest.java | 221 +++++++++++++++++++++ 1 file changed, 221 insertions(+) diff --git a/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java b/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java new file mode 100644 index 0000000..501cceb --- /dev/null +++ b/src/test/java/org/torproject/onionoo/docs/WeightsStatusTest.java @@ -0,0 +1,221 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.docs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.Map; +import java.util.SortedMap; + +public class WeightsStatusTest { + + @Test() + public void testSetup() { + WeightsStatus ws = new WeightsStatus(); + assertTrue("received: " + ws.toDocumentString(), + ws.toDocumentString().isEmpty()); + assertTrue("received: " + mapToString(ws.getHistory()), + ws.getHistory().isEmpty()); + } + + private String mapToString(SortedMap<long[], double[]> someMap) { + StringBuilder sb = new StringBuilder(); + for (Map.Entry<long[], double[]> entry : someMap.entrySet()) { + sb.append(Arrays.toString(entry.getKey())).append(" : ") + .append(Arrays.toString(entry.getValue())).append("\n"); + } + return sb.toString(); + } + + @Test() + public void testWeightHistory() { + WeightsStatus ws = new WeightsStatus(); + SortedMap<long[], double[]> history = ws.getHistory(); + assertTrue("actually: " + mapToString(history), history.isEmpty()); + long now = System.currentTimeMillis(); + long hourMillis = 60L * 60L * 1000L; + for (long j = 1L; j < 10L; j++) { // add arbitrary data + ws.addToHistory(now - j * hourMillis - hourMillis, + now - j * hourMillis, + new double[]{ 1.0 * j, 2.0 * j, 1.0 * j, 2.0 * j, 1.0 * j, + 2.0 * j, Double.NaN}); + assertEquals("have: " + mapToString(history), (int) j, history.size()); + } + ws.compressHistory(); + assertEquals("history map: " + mapToString(history), 9, history.size()); + assertFalse("document shouldn't contain NaN: " + ws.toDocumentString(), + ws.toDocumentString().contains("NaN")); + } + + @Test() + public void testWeightHistoryCompress() { + WeightsStatus ws = new WeightsStatus(); + SortedMap<long[], double[]> history = ws.getHistory(); + assertTrue("actually: " + mapToString(history), history.isEmpty()); + long longerAgo = 1415660400; + long hourMillis = 60L * 60L * 1000L; + for (long j = 1L; j < 10L; j++) { // add arbitrary data + ws.addToHistory(longerAgo - j * hourMillis - hourMillis, + longerAgo - j * hourMillis, + new double[]{ 1.0 * j, 2.0 * j, 1.0 * j, 2.0 * j, 1.0 * j, + 2.0 * j, j * 0.5}); + assertEquals("have: " + mapToString(history), (int) j, history.size()); + } + ws.compressHistory(); + assertEquals("history map: " + mapToString(history), 1, history.size()); + assertFalse("document shouldn't contain NaN: " + ws.toDocumentString(), + ws.toDocumentString().contains("NaN")); + } + + private static final String[] correctLines = new String[]{ // order matters! + "2015-05-07 21:00:00 2015-05-07 22:00:00 0.000178279826 0.000261827632" + + " 0.000200304932 0.000000000000 6980.000000000000\n", + "2015-05-07 22:00:00 2015-05-07 23:00:00 0.000178279826 0.000261827632" + + " 0.000200304932 0.000000000000 1080.000000000000\n", + "2015-05-07 23:00:00 2015-05-08 00:00:00 0.000178279826 0.000261827632" + + " 0.000200304932 0.000000000000 6980.000000000000\n" + }; + + private static String correctHistory = + "[1431032400000, 1431036000000] : [-1.0, 1.78279826E-4, 2.61827632E-4, " + + "2.00304932E-4, 0.0, -1.0, 6980.0]\n" + + "[1431036000000, 1431039600000] : [-1.0, 1.78279826E-4, 2.61827632E-4, " + + "2.00304932E-4, 0.0, -1.0, 1080.0]\n" + + "[1431039600000, 1431043200000] : [-1.0, 1.78279826E-4, 2.61827632E-4, " + + "2.00304932E-4, 0.0, -1.0, 6980.0]\n"; + + @Test() + public void testSetFromDocumentString() { + WeightsStatus ws = new WeightsStatus(); + String exp = ""; + for (String correctLine : correctLines) { + ws.setFromDocumentString(correctLine); + exp += correctLine; + assertEquals("document string: ", exp, ws.toDocumentString()); + } + assertEquals("history: ", correctHistory, mapToString(ws.getHistory())); + assertEquals(correctLines.length, ws.getHistory().size()); + ws.compressHistory(); + assertEquals("found: " + mapToString(ws.getHistory()), 1, + ws.getHistory().size()); + assertEquals("[1431032400000, 1431043200000] : [-1.0, 1.78279826E-4, " + + "2.61827632E-4, 2.00304932E-4, 0.0, -1.0, 5013.333333333333]\n", + mapToString(ws.getHistory())); + } + + private static final String[] correctLines2 = new String[]{ // order matters! + "2015-05-07 21:00:00 2015-05-07 22:00:00 0.000178279826 0.000261827632 " + + "0.000200304932 0.000000000000 6980.000000000000\n", + "2015-05-07 22:00:00 2015-05-07 23:00:00 0.000178279826 0.000261827632 " + + "0.000000000000 1080.000000000000\n", + "2015-05-07 23:00:00 2015-05-08 00:00:00 0.000178279826 0.000200304932 " + + "0.000000000000 6980.000000000000\n" + }; + + @Test() + public void testMissingValues() { + WeightsStatus ws = new WeightsStatus(); + String exp = ""; + for (String correctLine : correctLines2) { + ws.setFromDocumentString(correctLine); + exp += correctLine; + assertEquals("document string: ", exp, ws.toDocumentString()); + } + assertEquals(correctLines.length, ws.getHistory().size()); + ws.compressHistory(); + assertEquals("found: " + mapToString(ws.getHistory()), 3, + ws.getHistory().size()); + } + + private static final String[] wrongLines = new String[]{ + "1970-01-01 22:00:00 1970-01-01 23:00:00 " + + "0.000178279826 0.000261827632 0.000200304932 0 6980.000000200000\n", + "1970-01-04 22:00:00 1970-01-04 23:00:00 0.000178279826 0.000261827632" + + " 0.000200304932 0.000000000200 6980.000000000000\n", + "2013-07-07 22:00:00 2013-07-07 23:00:00 NaN 0.000178279826 " + + "0.000261827632 0,000200304932 0.000000000000 6980.000000000000\n", + "1971-01-06 22:00:00 1971-01-06 23:00:00 0,000178279826 0,000261827632" + + " 0,000200304932 0,000000000000 6980,000000000000\n" + }; + + @Test() + public void testSetFromDocumentStringWrongInput() { + WeightsStatus ws = new WeightsStatus(); + String exp = ""; + for (String wrongLine : wrongLines) { + ws.setFromDocumentString(wrongLine); + assertEquals(exp, ws.toDocumentString()); + } + } + + private static final String[] wrongDateLines = new String[]{ + "1970-01-02 22:00:00 1970-01-01 23:00:00 " // later day first + + "0.000178279826 0.000261827632 0.000200304932 0.000000000000 " + + " 6980.000000000000\n", + "1971-01-01 20:00:00 1971-01-01 10:00:00 " // later time first + + "0.000178279826 0.000261827632 0.000200304932 0.000000000000 " + + " 6980.000000000000\n", + "1970-01-02 22:00 1970-01-02 23:00 " // wrong time format + + "0.000178279826 0.000261827632 0.000200304932 0.000000000000 " + + " 6980.000000000000\n", + "1970/01/03 22:00:00 1970/01/03 23:00:00 " // wrong date format + + "0.000178279826 0.000261827632 0.000200304932 0.000000000000 " + + " 6980.000000000000\n" + }; + + @Test() + public void testSetFromDocumentStringWrongDateTime() { + WeightsStatus ws = new WeightsStatus(); + String exp = ""; + for (String wrongLine : wrongDateLines) { + ws.setFromDocumentString(wrongLine); + assertEquals(exp, ws.toDocumentString()); + } + } + + private static final String[] compareLines = new String[]{ + "2010-05-07 12:00:00 2010-05-07 13:00:01 " + + "1.000000000000 1.000000000000 1.000000000000 1.000000000000 " + + " 1.000000000000\n", + "2010-05-07 12:00:00 2010-05-07 13:00:02 " + + "2.000000000000 2.000000000000 2.000000000000 2.000000000000 " + + " 2.000000000000\n", + "2010-05-07 12:00:00 2010-05-07 13:00:03 " + + "3.000000000000 3.000000000000 3.000000000000 3.000000000000 " + + " 3.000000000000\n" + }; + + @Test() + public void testCompare() { + SortedMap<long[], double[]> hist = new WeightsStatus().getHistory(); + int count = 10; + for (int i = 0; i < count; i++) { + hist.put(new long[]{ i + 1, 2}, new double[]{}); + } + assertEquals(count, hist.size()); + for (int i = 0; i < count; i++) { + hist.put(new long[]{ 1, count - i}, new double[]{}); + } + assertEquals(2 * count - 1, hist.size()); + } + + @Test() + public void testSetDocument() { + WeightsStatus ws = new WeightsStatus(); + String exp = ""; + for (String compareLine : compareLines) { + exp += compareLine; + ws.setFromDocumentString(compareLine); + assertEquals("Expected " + exp + " but received " + ws.toDocumentString(), + exp, ws.toDocumentString()); + } + } + +} +

1 0

[webwml/master] Deprecate old Tor Browser version (6.0.5)
by gk＠torproject.org 17 Nov '16

17 Nov '16

commit 8e14a817af35beed24078ebafc5992a79190d31d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 17 13:13:53 2016 +0000 Deprecate old Tor Browser version (6.0.5) --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 47ce2d5..c5f8629 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,8 +1,4 @@ [ -"6.0.5", -"6.0.5-Linux", -"6.0.5-MacOS", -"6.0.5-Windows", "6.0.6", "6.0.6-Linux", "6.0.6-MacOS",

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 16 Nov '16

16 Nov '16

commit 69cce8a8171cf623e9c37d80008b8167a039690f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 22:17:08 2016 +0000 Update translations for torbutton-abouttorproperties --- is/abouttor.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/abouttor.properties b/is/abouttor.properties index 73282e1..100f246 100644 --- a/is/abouttor.properties +++ b/is/abouttor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.donate=Styrkja núna! +aboutTor.donationBanner.heart=Tor er í kjarna frelsis á netinu +aboutTor.donationBanner.tagline1=Milljónir manna reiða sig á Tor fyrir öryggi og persónuvernd á netinu +aboutTor.donationBanner.tagline2=Net af fólki að vernda fólk +aboutTor.donationBanner.tagline3=Eftirlit = Harðstjórn aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Nov '16

16 Nov '16

commit 3ac81969311aaa19d84d1424c5ed0928e228b794 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 22:15:21 2016 +0000 Update translations for https_everywhere --- is/https-everywhere.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/is/https-everywhere.dtd b/is/https-everywhere.dtd index 21cc9a1..c18dfc8 100644 --- a/is/https-everywhere.dtd +++ b/is/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "Búið til af"> <!ENTITY https-everywhere.about.and " og"> <!ENTITY https-everywhere.about.librarians ""Ruleset Librarians""> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "Bæta við nýrri reglu"> <!ENTITY https-everywhere.about.thanks "Þökk sé"> <!ENTITY https-everywhere.about.many_contributors "gríðarlega mörgum aðilum, þar á meðal"> <!ENTITY https-everywhere.about.noscript "Ennfremur má geta bað hlutar HTTPS Everywhere eru byggðir á kóða frá NoScript, eftir Giorgio Maone og fleiri. Við stöndum í þakkarskuld við þá !"> @@ -15,12 +15,12 @@ <!ENTITY https-everywhere.about.or "eða"> <!ENTITY https-everywhere.about.donate_eff "Framlag til EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Styrkja EFF"> <!ENTITY https-everywhere.menu.about "Um HTTPS Allsstaðar"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory valkostir"> <!ENTITY https-everywhere.menu.globalEnable "Virkja HTTPS Allsstaðar"> <!ENTITY https-everywhere.menu.globalDisable "Gera HTTPS Allsstaðar óvirkt"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Hindra allar ódulritaðar beiðnir"> <!ENTITY https-everywhere.menu.showCounter "Birta teljara"> <!ENTITY https-everywhere.menu.viewAllRules "Skoða allar reglur"> @@ -39,19 +39,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Frumstillaá sjálfgefið"> <!ENTITY https-everywhere.prefs.view_xml_source "Skoða XML-uppruna"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.stable_rules "Stöðugar reglur"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Þvinga dulritaðar tengingar við þessi vefsvæði:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Reglur á tilraunastigi"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.add_rule "Bæta við reglu fyrir þetta vefsvæði"> +<!ENTITY https-everywhere.chrome.add_new_rule "Bæta við nýrri reglu fyrir þetta vefsvæði"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Alltaf nota HTTPS fyrir þessa vél"> +<!ENTITY https-everywhere.chrome.host "Hýsilvél:"> +<!ENTITY https-everywhere.chrome.show_advanced "Birta ítalegt"> +<!ENTITY https-everywhere.chrome.hide_advanced "Fela ítalegt"> +<!ENTITY https-everywhere.chrome.rule_name "Heiti reglu"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> +<!ENTITY https-everywhere.chrome.redirect_to "Endurbeina á"> <!ENTITY https-everywhere.chrome.status_cancel_button "Hætta við">

1 0

[webwml/master] Add new Tor Browser version (6.5a4/6.5a4-hardened)
by gk＠torproject.org 16 Nov '16

16 Nov '16

commit 64731cd906a5731f240419af57a1ff4520979ba4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 16 21:01:59 2016 +0000 Add new Tor Browser version (6.5a4/6.5a4-hardened) --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index f62baf8..6f088b5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.6</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a3</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a4</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.0.6</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-11-15</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a3</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-09-20</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a4</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-11-16</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.6</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-11-15</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.6</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-11-15</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-09-20</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-09-20</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-11-16</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-11-16</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.6</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-11-15</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.6</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-11-15</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a3</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-09-20</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a4</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-11-16</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 8ccaa1b..47ce2d5 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -12,5 +12,11 @@ "6.5a3-MacOS", "6.5a3-Windows", "6.5a3-hardened", -"6.5a3-hardened-Linux" +"6.5a3-hardened-Linux", +"6.5a4", +"6.5a4-Linux", +"6.5a4-MacOS", +"6.5a4-Windows", +"6.5a4-hardened", +"6.5a4-hardened-Linux" ]

1 0

[webwml/master] Remote grants officer job posting
by sebastian＠torproject.org 16 Nov '16

16 Nov '16

commit 8a2844031e44c78d9b049469b5e75b4477523fb7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 16 19:21:04 2016 +0100 Remote grants officer job posting --- about/en/jobs-grants-officer.wml | 127 --------------------------------------- about/en/jobs.wml | 1 - 2 files changed, 128 deletions(-) diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml deleted file mode 100644 index eb93b0b..0000000 --- a/about/en/jobs-grants-officer.wml +++ /dev/null @@ -1,127 +0,0 @@ -## translation metadata -# Revision: $Revision: 25666 $ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Jobs (Controller)" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page about/overview>">About » </a> - <a href="<page about/jobs>">Jobs</a> - </div> - <div id="maincol"> -<h1>Internet Freedom Nonprofit Seeks Experienced Chief Financial and Grants Officer</h1> -<h2>(Posted August 29, 2016)</h2> - -<p>The Tor Project, Inc., is a 501(c)(3) organization headquartered in -Seattle that provides the technical infrastructure for privacy -protection over the Internet. With paid staff and contractors of around -25 technologists and operational support people, plus many volunteers -all over the world who contribute to our work, the Tor Project is funded -in part by government grants and contracts, as well as by individual, -foundation, and corporate donations. Our mission statement: “To advance -human rights and freedoms by creating and deploying free and open -anonymity and privacy technologies, supporting their unrestricted -availability and use, and furthering their scientific and popular -understanding.”</p> -<p>We are currently seeking an Experienced Chief Financial and Grants -Officer. This new, senior level position will report directly to the -Executive Director and will manage the offsite Accounting Manager. -</p> -<h2 id="major-responsibilities-and-duties">The Chief Financial and -Grants Officer will serve as the Tor Project's senior grants officer. -Grant-related tasks include, but are not limited to:</h2> -<ul> - -<li>Oversee grants and contracts to ensure compliance with funder -requirements and progress toward annual goals.</li> -<li>Maintain positive relationships & communications with applicable -government agencies.</li> -<li>reate an interactive database of all grants and contracts in -order to monitor and track them.</li> -<li>Manage invoicing and billing of federal contracts to ensure full -payment is received.</li> -<li>Communicate the status of grant activities and progress toward -objectives to stakeholders.</li> -<li>Maintain files and documentation for our federal grants and -contracts to ensure accuracy and compliance.</li> - -</ul> -<h2 id="required-knowledge-skills-abilities">In addition, the Chief -Financial and Grants Officer will serve as the Tor Project's senior -finance officer. Finance-related tasks for this position include, but -are not limited to: -</h2> -<ul> -<li>Maintain accounting controls by preparing and recommending -policies and procedures; review and upgrade as needed to ensure accuracy -in accounting activities and compliance with any regulatory -changes.</li> -<li>Monitor and project cash flow.</li> -<li>Provide oversight to ensure accounts payable and receivables are -coded and prepared correctly.</li> -<li>Work with outside auditors and CPA firm to furnish requisite data -to ensure timely completion of annual audits and tax filings.</li> -<li>Work closely with the Executive Director to prepare budgets and -financial reports.</li> -<li>Track expenditures and income of various programs to ensure -financial sustainability.</li> -</ul> -<h2 id="education-and-work-experience-requirements"> The person we seek -should have the following qualities, skills, and abilities:</h2> -<ul> -<li>5+ years of experience with federal grants and contract -acquisition and management</li> -<li>5+ years of experience overseeing a nonprofit organization's -accounting function; other relevant experience may substitute for a -portion of this required experience</li> -<li>Bachelor’s degree in business, finance, accounting, or a closely -related field is ideal but not required; advanced graduate degree in one -of the above fields is preferred; CPA license a plus</li> -<li>Working knowledge of not-for-profit accounting in accordance with -U.S. Generally Accepted Accounting Principles, Subpart F, of the new -Uniform Grant Guidance (formerly OMB Circular A-133) and appropriate -Code of Federal Regulations</li> -<li>Knowledge of the grants management software landscape, and -advanced skill and experience with at least one grants management -software package</li> -<li>Advanced skill and experience using QuickBooks, Sage (Peachtree), -or some other organizational accounting program</li> -<li>Alignment with Tor Project’s mission and a passion for privacy -and encryption technology preferred</li> -<li>Experience with FOSS (free/open-source software) preferred</li> -<li>Proficient understanding of and ability to use technology; -willingness and ability to learn and use new technologies</li> -<li>Hard working and highly organized with superior attention to -detail</li> -</ul> -<p>The Tor Project's workforce is smart, passionate, and dedicated. -Experience working with open source communities and/or a commitment to -Internet civil liberties are added pluses for any candidate applying for -this position.</p> - -<p>Flexible salary, depending on experience. The Tor Project has a -competitive benefits package, including a generous PTO policy; 14 paid -holidays per year (including the week between Christmas and New Year's, -when the office is closed); health, vision, dental, disability, and life -insurance paid in full for employee; flexible work schedule; and -occasional travel opportunities. The Tor Project, Inc., is an equal -opportunity, affirmative action employer.</p> - -<p>This is a full-time position based in our sunny office in Pioneer -Square. To apply, send a cover letter and your resume to -hr(a)torproject.org with “Chief Financial and Grants Officer” in the -subject line. Inquiries about whether this job can be done remotely or -part-time will not be answered. No phone calls please!</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 29c2a94..edcda90 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -19,7 +19,6 @@ <p>Specifically, we're looking for the following people currently: </p> <ul> -<li><a href="<page about/jobs-grants-officer>">Chief Financial and Grants Officer</a></li> <li><a href="<page about/jobs-ooni-ux-designer>">UX Designer - OONI</a></li> #<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> #<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li>

1 0

[onionoo/master] Stop using a lock file.
by karsten＠torproject.org 16 Nov '16

16 Nov '16

commit 621fbbfcce67e63994fe67014a56147f2b5b2299 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 16 12:09:05 2016 +0100 Stop using a lock file. Chances of two concurrent runs are much lower since we switched to an internal scheduler. Let's remove some complexity here. Implements #20681. --- .../java/org/torproject/onionoo/cron/Main.java | 27 --------- .../java/org/torproject/onionoo/util/LockFile.java | 67 ---------------------- 2 files changed, 94 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/cron/Main.java b/src/main/java/org/torproject/onionoo/cron/Main.java index 04b6955..5b80934 100644 --- a/src/main/java/org/torproject/onionoo/cron/Main.java +++ b/src/main/java/org/torproject/onionoo/cron/Main.java @@ -8,7 +8,6 @@ import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.updater.DescriptorSource; import org.torproject.onionoo.updater.DescriptorSourceFactory; import org.torproject.onionoo.updater.StatusUpdateRunner; -import org.torproject.onionoo.util.LockFile; import org.torproject.onionoo.writer.DocumentWriterRunner; import org.slf4j.Logger; @@ -125,7 +124,6 @@ public class Main implements Runnable { @Override public void run() { - this.acquireLockOrExit(); this.initialize(); this.downloadDescriptors(); this.updateStatuses(); @@ -133,21 +131,6 @@ public class Main implements Runnable { this.shutDown(); this.gatherStatistics(); this.cleanUp(); - this.releaseLock(); - } - - private LockFile lf; - - private void acquireLockOrExit() { - this.log.info("Initializing."); - this.lf = new LockFile(); - if (this.lf.acquireLock()) { - this.log.info("Acquired lock"); - } else { - this.log.error("Could not acquire lock. Is Onionoo already " - + "running? Terminating"); - System.exit(1); - } } private DescriptorSource dso; @@ -246,15 +229,5 @@ public class Main implements Runnable { DescriptorSourceFactory.setDescriptorSource(null); this.log.info("Done."); } - - private void releaseLock() { - this.log.info("Releasing lock."); - if (this.lf.releaseLock()) { - this.log.info("Released lock"); - } else { - this.log.error("Could not release lock. The next execution may " - + "not start as expected"); - } - } } diff --git a/src/main/java/org/torproject/onionoo/util/LockFile.java b/src/main/java/org/torproject/onionoo/util/LockFile.java deleted file mode 100644 index 521b867..0000000 --- a/src/main/java/org/torproject/onionoo/util/LockFile.java +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 2013--2016 The Tor Project - * See LICENSE for licensing information */ - -package org.torproject.onionoo.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -public class LockFile { - - private static final Logger log = LoggerFactory.getLogger( - LockFile.class); - - private final File lockFile = new File("lock"); - - /** - * Acquire the lock by writing a lock file with the current time in - * milliseconds and return whether this operation was successful. - * - * @return <code>true</code> if the lock file did not exist and writing - * that file now succeeded, <code>false</code> otherwise. - */ - public boolean acquireLock() { - Time time = TimeFactory.getTime(); - try { - if (this.lockFile.exists()) { - return false; - } - if (this.lockFile.getParentFile() != null) { - this.lockFile.getParentFile().mkdirs(); - } - } catch (SecurityException e) { - log.error("Unable to access lock file location", e); - return false; - } - - try (BufferedWriter bw = new BufferedWriter(new FileWriter( - this.lockFile))) { - bw.append(String.valueOf(time.currentTimeMillis())); - bw.newLine(); - return true; - } catch (IOException e) { - log.error("Caught exception while trying to acquire lock!", e); - return false; - } - } - - /** - * Release the lock by deleting the lock file if it exists and return - * whether the file was successfully deleted. - * - * @return <code>true</code> if the lock file does not exist anymore - * when returning, <code>false</code> otherwise. - */ - public boolean releaseLock() { - if (this.lockFile.exists()) { - this.lockFile.delete(); - } - return !this.lockFile.exists(); - } -} -

1 0