- tor-commits - lists.torproject.org

r24638: {} German translation of info.wmi for press/ (by Sacro) (website/trunk/press/de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:26:14 +0000 (Sat, 16 Apr 2011) New Revision: 24638 Added: website/trunk/press/de/info.wmi Log: German translation of info.wmi for press/ (by Sacro) Added: website/trunk/press/de/info.wmi =================================================================== --- website/trunk/press/de/info.wmi (rev 0) +++ website/trunk/press/de/info.wmi 2011-04-16 19:26:14 UTC (rev 24638) @@ -0,0 +1,18 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="media">Presse-Kontakt</h2> + <p> + <b>Andrew Lewman</b><br> + Verantwortlicher Direktor<br> + execdir(a)torproject.org<br> + +1-406-356-6475<br> + </p> + </div> +  +</div> + +

1 0

r24637: {} Deleting pl_PL/ because we already have pl/ (website/trunk/press)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:25:13 +0000 (Sat, 16 Apr 2011) New Revision: 24637 Removed: website/trunk/press/pl_PL/ Log: Deleting pl_PL/ because we already have pl/

1 0

r24636: {} German translation of sidenav.wmi for press/ (by Sacro) (in website/trunk/press: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:24:45 +0000 (Sat, 16 Apr 2011) New Revision: 24636 Added: website/trunk/press/de/ website/trunk/press/de/sidenav.wmi Log: German translation of sidenav.wmi for press/ (by Sacro) Added: website/trunk/press/de/sidenav.wmi =================================================================== --- website/trunk/press/de/sidenav.wmi (rev 0) +++ website/trunk/press/de/sidenav.wmi 2011-04-16 19:24:45 UTC (rev 24636) @@ -0,0 +1,33 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /press pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'press/press', + 'txt' => 'Presseveröffentlichungen', + }, + {'url' => 'press/inthemedia', + 'txt' => 'Tor in den Medien', + }, + {'url' => 'https://blog.torproject.org/', + 'txt' => 'Tor Blog', + }, + ]; +:> +

1 0

r24635: {} German translation of sidenav.wmi for donate/ (by Sacro) (website/trunk/donate/de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 18:11:48 +0000 (Sat, 16 Apr 2011) New Revision: 24635 Added: website/trunk/donate/de/sidenav.wmi Log: German translation of sidenav.wmi for donate/ (by Sacro) Added: website/trunk/donate/de/sidenav.wmi =================================================================== --- website/trunk/donate/de/sidenav.wmi (rev 0) +++ website/trunk/donate/de/sidenav.wmi 2011-04-16 18:11:48 UTC (rev 24635) @@ -0,0 +1,39 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /donate pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'donate/donate', + 'txt' => 'Geldspenden', + }, + {'url' => 'donate/donate-hardware', + 'txt' => 'Hardware-Spenden', + }, + {'url' => 'donate/donate-service', + 'txt' => 'Dienst-Spenden', + }, + {'url' => 'donate/matching-program', + 'txt' => 'Matching-Programm', + }, + {'url' => 'donate/become-sponsor', + 'txt' => 'Werde ein Sponsor', + }, + ]; +:> +

1 0

r24634: {projects} added Privoxy info and link to about dialog (projects/android/trunk/Orbot/res/layout)
by Nathan Freitas 16 Apr '11

16 Apr '11

Author: n8fr8 Date: 2011-04-16 13:21:22 +0000 (Sat, 16 Apr 2011) New Revision: 24634 Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml Log: added Privoxy info and link to about dialog Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_about.xml 2011-04-16 13:16:49 UTC (rev 24633) +++ projects/android/trunk/Orbot/res/layout/layout_about.xml 2011-04-16 13:21:22 UTC (rev 24634) @@ -94,7 +94,13 @@ android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - + <TextView android:text="Privoxy v3.0.12: http://www.privoxy.org" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:textColorLink="#ffffff" + android:paddingLeft="15px" + android:textColor="#ffffff" /> </LinearLayout> </ScrollView> </LinearLayout>

1 0

r24633: {projects} updating our license to include Privoxy (projects/android/trunk/Orbot)
by Nathan Freitas 16 Apr '11

16 Apr '11

Author: n8fr8 Date: 2011-04-16 13:16:49 +0000 (Sat, 16 Apr 2011) New Revision: 24633 Modified: projects/android/trunk/Orbot/LICENSE Log: updating our license to include Privoxy Modified: projects/android/trunk/Orbot/LICENSE =================================================================== --- projects/android/trunk/Orbot/LICENSE 2011-04-15 16:39:35 UTC (rev 24632) +++ projects/android/trunk/Orbot/LICENSE 2011-04-16 13:16:49 UTC (rev 24633) @@ -3,7 +3,7 @@ It also lists the licenses for other components used by Orbot. -For more information about Orbot, see http://guardianproject.info/ +For more information about Orbot, see https://guardianproject.info/apps/orbot If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. @@ -41,15 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***** -Orbot contains a binary distribution of the JSocks library: -http://code.google.com/p/jsocks-mirror/ -which is licensed under the GNU Lesser General Public License: -http://www.gnu.org/licenses/lgpl.html +Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/) +Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers(a)lists.sourceforge.net> +http://www.privoxy.org/user-manual/copyright.html -***** -Orbot contains the source code for HttpProxy developed and freely licensed -by: Julian Robichaux -- http://www.nsftools.com +Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. +and licensed under the GNU General Public License. +Privoxy is free software; you can redistribute it and/or modify it under the terms of the +GNU General Public License, version 2, as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. +http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + ****** Orbot contains a binary distribution of Tor: @@ -63,7 +69,6 @@ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. - =============================================================================== Tor is distributed under this license:

1 0

[torperf/master] Add ChangeLog entry for including <arpa/inet.h>.
by karsten＠torproject.org 16 Apr '11

16 Apr '11

commit d8e30744d176167d9015d3d390c588927384bd11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Apr 16 12:18:47 2011 +0200 Add ChangeLog entry for including <arpa/inet.h>. --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d05cd70..b41f1be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Torperf change log: Changes in version 0.0.2 - 2011-??-?? + - Include <arpa/inet.h> for the BSDs that don't get ntohl from any of + the other includes. Changes in version 0.0.1 - 2011-04-12 - Initial release

1 0

[torperf/master] (util.c): #include <arpa/inet.h> for ntohl().
by karsten＠torproject.org 16 Apr '11

16 Apr '11

commit 28061a3d049ce72ade656c9970f2cf75750af57f Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Apr 14 23:24:53 2011 +0200 (util.c): #include <arpa/inet.h> for ntohl(). The BSD's don't get ntohl from any of the other includes. --- util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/util.c b/util.c index fdf7681..96cee0a 100644 --- a/util.c +++ b/util.c @@ -13,6 +13,7 @@ #include <sys/types.h> #include <sys/socket.h> +#include <arpa/inet.h> #include <unistd.h> #include <stdint.h> #include <assert.h>

1 0

[metrics-web/master] Simplify refresh functions a bit.
by karsten＠torproject.org 15 Apr '11

15 Apr '11

commit 3038ee939fb7690e75a9b046e6d6e3b756036d82 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 15 22:23:45 2011 +0200 Simplify refresh functions a bit. --- db/tordir.sql | 128 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 64 insertions(+), 64 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index d5238ea..ab0482e 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -378,25 +378,27 @@ CREATE OR REPLACE FUNCTION refresh_network_size() RETURNS INTEGER AS $$ INSERT INTO network_size (date, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) - SELECT - DATE(validafter) AS date, - COUNT(*) / relay_statuses_per_day.count AS avg_running, - SUM(CASE WHEN isexit IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_exit, - SUM(CASE WHEN isguard IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_guard, - SUM(CASE WHEN isfast IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_fast, - SUM(CASE WHEN isstable IS TRUE THEN 1 ELSE 0 END) - / relay_statuses_per_day.count AS avg_stable - FROM statusentry - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE + SELECT date, + isrunning / count AS avg_running, + isexit / count AS avg_exit, + isguard / count AS avg_guard, + isfast / count AS avg_fast, + isstable / count AS avg_stable + FROM ( + SELECT DATE(validafter) AS date, + COUNT(*) AS isrunning, + COUNT(NULLIF(isexit, FALSE)) AS isexit, + COUNT(NULLIF(isguard, FALSE)) AS isguard, + COUNT(NULLIF(isfast, FALSE)) AS isfast, + COUNT(NULLIF(isstable, FALSE)) AS isstable + FROM statusentry + WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) AND DATE(validafter) <= (SELECT MAX(date) FROM updates) AND DATE(validafter) IN (SELECT date FROM updates) - GROUP BY DATE(validafter), relay_statuses_per_day.count; + GROUP BY DATE(validafter) + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END; @@ -412,10 +414,10 @@ CREATE OR REPLACE FUNCTION refresh_network_size_hour() RETURNS INTEGER AS $$ INSERT INTO network_size_hour (validafter, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) SELECT validafter, COUNT(*) AS avg_running, - SUM(CASE WHEN isexit IS TRUE THEN 1 ELSE 0 END) AS avg_exit, - SUM(CASE WHEN isguard IS TRUE THEN 1 ELSE 0 END) AS avg_guard, - SUM(CASE WHEN isfast IS TRUE THEN 1 ELSE 0 END) AS avg_fast, - SUM(CASE WHEN isstable IS TRUE THEN 1 ELSE 0 END) AS avg_stable + COUNT(NULLIF(isexit, FALSE)) AS avg_exit, + COUNT(NULLIF(isguard, FALSE)) AS avg_guard, + COUNT(NULLIF(isfast, FALSE)) AS avg_fast, + COUNT(NULLIF(isstable, FALSE)) AS avg_stable FROM statusentry WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) @@ -436,35 +438,37 @@ CREATE OR REPLACE FUNCTION refresh_relay_platforms() RETURNS INTEGER AS $$ INSERT INTO relay_platforms (date, avg_linux, avg_darwin, avg_bsd, avg_windows, avg_other) - SELECT DATE(validafter), - SUM(CASE WHEN platform LIKE '%Linux%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_linux, - SUM(CASE WHEN platform LIKE '%Darwin%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_darwin, - SUM(CASE WHEN platform LIKE '%BSD%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_bsd, - SUM(CASE WHEN platform LIKE '%Windows%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_windows, - SUM(CASE WHEN platform NOT LIKE '%Windows%' - AND platform NOT LIKE '%Darwin%' - AND platform NOT LIKE '%BSD%' - AND platform NOT LIKE '%Linux%' THEN 1 ELSE 0 END) / - relay_statuses_per_day.count AS avg_other - FROM descriptor RIGHT JOIN statusentry - ON statusentry.descriptor = descriptor.descriptor - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE + SELECT date, + linux / count AS avg_linux, + darwin / count AS avg_darwin, + bsd / count AS avg_bsd, + windows / count AS avg_windows, + other / count AS avg_other + FROM ( + SELECT DATE(validafter) AS date, + SUM(CASE WHEN platform LIKE '%Linux%' THEN 1 ELSE 0 END) + AS linux, + SUM(CASE WHEN platform LIKE '%Darwin%' THEN 1 ELSE 0 END) + AS darwin, + SUM(CASE WHEN platform LIKE '%BSD%' THEN 1 ELSE 0 END) + AS bsd, + SUM(CASE WHEN platform LIKE '%Windows%' THEN 1 ELSE 0 END) + AS windows, + SUM(CASE WHEN platform NOT LIKE '%Windows%' + AND platform NOT LIKE '%Darwin%' + AND platform NOT LIKE '%BSD%' + AND platform NOT LIKE '%Linux%' THEN 1 ELSE 0 END) + AS other + FROM descriptor + RIGHT JOIN statusentry + ON statusentry.descriptor = descriptor.descriptor + WHERE isrunning = TRUE AND DATE(validafter) >= (SELECT MIN(date) FROM updates) AND DATE(validafter) <= (SELECT MAX(date) FROM updates) AND DATE(validafter) IN (SELECT date FROM updates) - AND DATE(relay_statuses_per_day.date) >= - (SELECT MIN(date) FROM updates) - AND DATE(relay_statuses_per_day.date) <= - (SELECT MAX(date) FROM updates) - AND DATE(relay_statuses_per_day.date) IN - (SELECT date FROM updates) - GROUP BY DATE(validafter), relay_statuses_per_day.count; + GROUP BY DATE(validafter) + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END; @@ -479,24 +483,20 @@ CREATE OR REPLACE FUNCTION refresh_relay_versions() RETURNS INTEGER AS $$ INSERT INTO relay_versions (date, version, relays) - SELECT DATE(validafter), SUBSTRING(platform, 5, 5) AS version, - COUNT(*) / relay_statuses_per_day.count AS relays - FROM descriptor RIGHT JOIN statusentry - ON descriptor.descriptor = statusentry.descriptor - JOIN relay_statuses_per_day - ON DATE(validafter) = relay_statuses_per_day.date - WHERE isrunning = TRUE - AND DATE(validafter) >= (SELECT MIN(date) FROM updates) - AND DATE(validafter) <= (SELECT MAX(date) FROM updates) - AND DATE(validafter) IN (SELECT date FROM updates) - AND DATE(relay_statuses_per_day.date) >= - (SELECT MIN(date) FROM updates) - AND DATE(relay_statuses_per_day.date) <= - (SELECT MAX(date) FROM updates) - AND DATE(relay_statuses_per_day.date) IN - (SELECT date FROM updates) - AND platform IS NOT NULL - GROUP BY 1, 2, relay_statuses_per_day.count; + SELECT date, version, relays / count AS relays + FROM ( + SELECT DATE(validafter), SUBSTRING(platform, 5, 5) AS version, + COUNT(*) AS relays + FROM descriptor RIGHT JOIN statusentry + ON descriptor.descriptor = statusentry.descriptor + WHERE isrunning = TRUE + AND platform IS NOT NULL + AND DATE(validafter) >= (SELECT MIN(date) FROM updates) + AND DATE(validafter) <= (SELECT MAX(date) FROM updates) + AND DATE(validafter) IN (SELECT date FROM updates) + GROUP BY 1, 2 + ) b + NATURAL JOIN relay_statuses_per_day; RETURN 1; END;

1 0

[metrics-web/master] Remove unknown versions from graph.
by karsten＠torproject.org 15 Apr '11

15 Apr '11

commit d7fec0847540b945074d37b3f11f5a6c288445f3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 15 22:20:37 2011 +0200 Remove unknown versions from graph. --- rserve/graphs.R | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index c3d0ea3..a37f9bd 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -52,11 +52,13 @@ plot_versions <- function(start, end, path, dpi) { versions <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) + known_versions <- c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", + "0.2.2", "0.2.3") + versions <- versions[versions$version %in% known_versions, ] visible_versions <- sort(unique(versions$version)) versions <- rbind(data.frame( date = as.Date(rep(end, 7)), - version = c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", "0.2.2", - "0.2.3"), + version = known_versions, relays = rep(NA, 7)), versions) ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) +

1 0