[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit c2fa9fccaeba14289c973aa6636c99340b49aaf3 Author: Translation commit bot Date: Tue Dec 3 07:48:29 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fa.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa.po b/fa.po index b70ae395aa..65a9a7f191 100644 --- a/fa.po +++ b/fa.po @@ -30,8 +30,8 @@ # magnifico, 2019 # Samaneh M , 2019 # Sina Eghbal , 2016 -# Vox, 2019 -# Vox, 2018 +# b0b47d46632b78a09a40de799fda9a65, 2019 +# b0b47d46632b78a09a40de799fda9a65, 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy] https://gitweb.torproject.org/translation.git/commit/?h=torbirdy
commit aaef8d31d3049af92985817d3f3c65e662d6aedd Author: Translation commit bot Date: Tue Dec 3 03:50:41 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbirdy --- ia/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ia/torbirdy.dtd b/ia/torbirdy.dtd index 330b3779ba..15265f9208 100644 --- a/ia/torbirdy.dtd +++ b/ia/torbirdy.dtd @@ -4,14 +4,14 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
commit f875340e0d0834963608a2fe0a79b29bc72960ef Author: Translation commit bot Date: Tue Dec 3 03:51:12 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties --- ia/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ia/torbutton.properties b/ia/torbutton.properties index 1020e57a5e..acd33e5464 100644 --- a/ia/torbutton.properties +++ b/ia/torbutton.properties @@ -19,7 +19,7 @@ torbutton.popup.external.app = Tor Browser cannot display this file. You will ne torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n torbutton.popup.launch = Download file -torbutton.popup.cancel = Cancel +torbutton.popup.cancel = Cancellar torbutton.popup.dontask = Automatically download files from now on torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = Security Settings ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
commit f7fe13b5b2900c5b8e8b242bd98aabc6933e681e Author: Translation commit bot Date: Tue Dec 3 03:49:35 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup --- ia/ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/ia.po b/ia/ia.po index 7584bc6bec..fea0cfbe7e 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2012-10-03 17:39+\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-12-03 03:33+\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -289,7 +289,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:66 msgid "Delete" -msgstr "" +msgstr "Deler" #: ../lib/Tails/Persistence/Step/Delete.pm:117 msgid "Deleting..." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
commit 3a8656228cab8393b2421283f9695124e7a89b4a Author: Translation commit bot Date: Tue Dec 3 03:49:02 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- ia/ia.po | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ia/ia.po b/ia/ia.po index 33e7a19df8..98d52e112b 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# SoftInterlingua <>, 2019 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+\n" +"Last-Translator: SoftInterlingua <>, 2019\n" "Language-Team: Interlingua (https://www.transifex.com/otf/teams/1519/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,7 +256,7 @@ msgstr "" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: ../tailsgreeter/gui.py:608 msgid "Add" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit a541f8306f23a2089ff729ae322ec48893f2fdbc Author: Translation commit bot Date: Tue Dec 3 03:48:27 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ia.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ia.po b/ia.po index 07095d619a..4f3748915b 100644 --- a/ia.po +++ b/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2013-07-25 09:07+\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-12-03 03:32+\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit b4797c516263a50814064ed1e3bef836c9f3e84d Author: Translation commit bot Date: Tue Dec 3 03:47:22 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia.po b/ia.po index 07095d619a..b4eb9595d9 100644 --- a/ia.po +++ b/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2013-07-25 09:07+\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-12-03 03:32+\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +104,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 #: config/chroot_local-includes/usr/local/bin/tor-browser:49 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46 msgid "Add" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
commit 606eeaa2faf7dd654f1c7d8a39d6d2e37eac4a34 Author: Translation commit bot Date: Tue Dec 3 03:46:18 2019 + https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- ia/ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/ia.po b/ia/ia.po index 45ce71d2d9..ac5e4f5035 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-21 09:03+0200\n" -"PO-Revision-Date: 2012-10-03 17:40+\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-12-03 03:32+\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -413,7 +413,7 @@ msgstr "" #: ../tails_installer/gui.py:738 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: ../tails_installer/gui.py:774 msgid "Unable to mount device" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 1d0b659fee249c3106b532ce7e59e3d3df010029 Author: Translation commit bot Date: Tue Dec 3 03:46:06 2019 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ia/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/https-everywhere.dtd b/ia/https-everywhere.dtd index 6fdbd7cb8b..1327b98028 100644 --- a/ia/https-everywhere.dtd +++ b/ia/https-everywhere.dtd @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -65,4 +65,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a simple test for checkSpace.pl
commit bd61a4e84891027dfabba6be62886f3baeb41e27
Author: Nick Mathewson
Date: Tue Nov 26 13:10:39 2019 -0500
Add a simple test for checkSpace.pl
This script is not expected to work on windows due to line-ending
issues, so I'm not making it get run on an automated basis. We
should use it when editing checkSpace.pl.
Closes ticket 32613.
---
scripts/maint/checkSpaceTest.sh | 23 +++
scripts/maint/checkspace_tests/dubious.c| 83 +
scripts/maint/checkspace_tests/dubious.h| 4 ++
scripts/maint/checkspace_tests/expected.txt | 31 +
scripts/maint/checkspace_tests/good_guard.h | 6 ++
scripts/maint/checkspace_tests/same_guard.h | 6 ++
scripts/maint/checkspace_tests/subdir/dubious.c | 1 +
7 files changed, 154 insertions(+)
diff --git a/scripts/maint/checkSpaceTest.sh b/scripts/maint/checkSpaceTest.sh
new file mode 100755
index 0..a1eea58eb
--- /dev/null
+++ b/scripts/maint/checkSpaceTest.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Copyright 2019, The Tor Project, Inc.
+# See LICENSE for licensing information
+
+# Integration test for checkSpace.pl, which we want to rewrite.
+
+umask 077
+set -e
+
+# make a safe space for temporary files
+DATA_DIR=$(mktemp -d -t tor_checkspace_tests.XX)
+trap 'rm -rf "$DATA_DIR"' 0
+
+RECEIVED_FNAME="${DATA_DIR}/got.txt"
+
+cd "$(dirname "$0")/checkspace_tests"
+
+# we expect this to give an error code.
+../checkSpace.pl -C ./*.[ch] ./*/*.[ch] > "${RECEIVED_FNAME}" && exit 1
+
+diff -u expected.txt "${RECEIVED_FNAME}" || exit 1
+
+echo "OK"
diff --git a/scripts/maint/checkspace_tests/dubious.c
b/scripts/maint/checkspace_tests/dubious.c
new file mode 100644
index 0..59c5f8e4f
--- /dev/null
+++ b/scripts/maint/checkspace_tests/dubious.c
@@ -0,0 +1,83 @@
+
+// The { coming up should be on its own line.
+int
+foo(void) {
+ // There should be a space before (1)
+ if(1) x += 1;
+
+ // The following empty line is unnecessary.
+
+}
+
+
+// There should be a newline between void and bar.
+void bar(void)
+{
+ // too wide:
+
testing("xxx");
+}
+
+long
+bad_spacing()
+{
+ // here comes a tab
+ return 2;
+ // here comes a label without space:
+foo:
+ ;
+}
+
+// Here comes a CR:
+
+// Trailing space:
+
+int
+non_k_and_r(void)
+{
+ // non-k
+ if (foo)
+{
+ // double-semi
+ return 1;;
+}
+ else
+{
+ return 2;
+}
+}
+
+// #else #if causes a warning.
+#if 1
+#else
+#if 2
+#else
+#endif
+#endif
+
+// always space before a brace.
+foo{
+}
+
+void
+unexpected_space(void)
+{
+ // This space gives a warning.
+ foobar (77);
+}
+
+void
+bad_function_calls(long)
+{
+ // These are forbidden:
+ assert(1);
+ memcmp("a","b",1);
+ strcat(foo,x);
+ strcpy(foo,y);
+ sprintf(foo,"x");
+ malloc(7);
+ free(p);
+ realloc(p);
+ strdup(s);
+ strndup(s,10);
+ calloc(a,b);
+}
diff --git a/scripts/maint/checkspace_tests/dubious.h
b/scripts/maint/checkspace_tests/dubious.h
new file mode 100644
index 0..744ec3395
--- /dev/null
+++ b/scripts/maint/checkspace_tests/dubious.h
@@ -0,0 +1,4 @@
+
+// no guards.
+
+int foo(int);
diff --git a/scripts/maint/checkspace_tests/expected.txt
b/scripts/maint/checkspace_tests/expected.txt
new file mode 100644
index 0..935b750ef
--- /dev/null
+++ b/scripts/maint/checkspace_tests/expected.txt
@@ -0,0 +1,31 @@
+fn() {:./dubious.c:4
+ KW(:./dubious.c:6
+ UnnecNL:./dubious.c:10
+ DoubleNL:./dubious.c:12
+ tp fn():./dubious.c:15
+ Wide:./dubious.c:17
+ TAB:./dubious.c:24
+ nosplabel:./dubious.c:26
+CR:./dubious.c:30
+ Space@EOL:./dubious.c:32
+ non-K {:./dubious.c:39
+;;:./dubious.c:41
+ }\nelse:./dubious.c:43
+ #else#if:./dubious.c:52
+o{:./dubious.c:58
+fn() {:./dubious.c:58
+ fn ():./dubious.c:65
+assert:./dubious.c:72 (use tor_assert)
+memcmp:./dubious.c:73 (use {tor,fast}_mem{eq,neq,cmp}
+ strcat(:./dubious.c:74
+ strcpy(:./dubious.c:75
+ sprintf(:./dubious.c:76
+ malloc(:./dubious.c:77(use tor_malloc, tor_free, etc)
+ free(:./dubious.c:78(use tor_malloc, tor_free, etc)
+ realloc(:./dubious.c:79(use tor_malloc, tor_free, etc)
+ strdup(:./dubious.c:80(use tor_malloc, tor_free, etc)
+ strndup(:./dubious.c:81(use tor_malloc, tor_free, etc)
+ calloc(:./dubious.c:82(use tor_malloc, tor_free, etc)
+ noguard:./dubious.h (No #ifndef/#define header guard pair found)
+ dupguard:./same_guard.h (Guard macro GUARD_MACRO_H also used in
./good_guard.h)
+ dup fname:./subdir/dubious.c (same as ./dubious.c).
diff --git a/scripts/maint/checkspace_tests/good_guard.h
b/scripts/maint/checkspace_tests/good_guard.h
new file mode 100644
index 0..b792912d9
--- /dev/null
+++ b/scripts/maint/checkspace_tests/good_guard.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MACRO_H
+#define GUARD_MACRO_H
[tor-commits] [tor/master] checkSpace.pl: make output more uniform.
commit 2aaa7ae6e2559d4fa62efc57b1cf2660868d9323
Author: Nick Mathewson
Date: Tue Nov 26 12:49:13 2019 -0500
checkSpace.pl: make output more uniform.
There were lots of slight differences in indentation and formatting
among the in-file error messages.
---
scripts/maint/checkSpace.pl | 51 ++---
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl
index 7be7f2a3c..f4e6f733c 100755
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@ -4,9 +4,16 @@ use strict;
use warnings;
my $found = 0;
+my $COLON_POS = 10;
+
sub msg {
$found = 1;
- print "$_[0]";
+ my $v = shift;
+ $v =~ /^\s*([^:]+):(.*)$/;
+ chomp(my $errtype = $1);
+ my $rest = $2;
+ my $padding = ' ' x ($COLON_POS - length $errtype);
+ print "$padding$errtype:$rest\n";
}
my $C = 0;
@@ -29,7 +36,7 @@ for my $fn (@ARGV) {
my $basename = $fn;
$basename =~ s#.*/##;
if ($basenames{$basename}) {
-msg "Duplicate fnames: $fn and $basenames{$basename}.\n";
+msg "dup fname:$fn (same as $basenames{$basename}).\n";
} else {
$basenames{$basename} = $fn;
}
@@ -42,12 +49,12 @@ for my $fn (@ARGV) {
#(We insist on lines that end with a single LF character, not
#CR LF.)
if (/\r/) {
-msg " CR:$fn:$.\n";
+msg "CR:$fn:$.\n";
}
## Warn about tabs.
#(We only use spaces)
if (/\t/) {
-msg " TAB:$fn:$.\n";
+msg "TAB:$fn:$.\n";
}
## Warn about labels that don't have a space in front of them
#(We indent every label at least one space)
@@ -63,12 +70,12 @@ for my $fn (@ARGV) {
## Warn about control keywords without following space.
#(We put a space after every 'if', 'while', 'for', 'switch', etc)
if ($C && /\s(?:if|while|for|switch)\(/) {
-msg " KW(:$fn:$.\n";
+msg "KW(:$fn:$.\n";
}
## Warn about #else #if instead of #elif.
#(We only allow #elif)
if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) {
-msg " #else#if:$fn:$.\n";
+msg "#else#if:$fn:$.\n";
}
## Warn about some K violations
#(We use K C, where open braces go on the same line as
@@ -83,19 +90,19 @@ for my $fn (@ARGV) {
msg "non-K {:$fn:$.\n";
}
if (/^\s*else/ and $lastline =~ /\}$/) {
-msg " }\\nelse:$fn:$.\n";
+msg "}\\nelse:$fn:$.\n";
}
$lastline = $_;
## Warn about unnecessary empty lines.
# (Don't put an empty line before a line that contains nothing
# but a closing brace.)
if ($lastnil && /^\s*}\n/) {
-msg " UnnecNL:$fn:$.\n";
+msg "UnnecNL:$fn:$.\n";
}
## Warn about multiple empty lines.
# (At most one blank line in a row.)
if ($lastnil && /^$/) {
-msg " DoubleNL:$fn:$.\n";
+msg "DoubleNL:$fn:$.\n";
} elsif (/^$/) {
$lastnil = 1;
} else {
@@ -105,7 +112,7 @@ for my $fn (@ARGV) {
## accept double-line lines.
# (Don't make lines wider than 80 characters, including newline.)
if (/^.{80}/) {
-msg " Wide:$fn:$.\n";
+msg "Wide:$fn:$.\n";
}
### Juju to skip over comments and strings, since the tests
### we're about to do are okay there.
@@ -146,26 +153,26 @@ for my $fn (@ARGV) {
next if /^\#/;
## Skip C++-style comments.
if (m!//!) {
-#msg " //:$fn:$.\n";
+#msg "//:$fn:$.\n";
s!//.*!!;
}
## Warn about unquoted braces preceded by non-space.
# (No character except a space should come before a {)
if (/([^\s'])\{/) {
-msg " $1\{:$fn:$.\n";
+msg "$1\{:$fn:$.\n";
}
## Warn about double semi-colons at the end of a line.
if (/;;$/) {
-msg " double semi-colons at the end of $. in $fn\n"
+msg ";;:$fn:$.\n"
}
## Warn about multiple internal spaces.
#if (/[^\s,:]\s{2,}[^\s\\=]/) {
-#msg " X X:$fn:$.\n";
+#msg "X X:$fn:$.\n";
#}
## Warn about { with stuff after.
#s/\s+$//;
#if (/\{[^\}\\]+$/) {
-#msg " {X:$fn:$.\n";
+#msg "{X:$fn:$.\n";
#}
## Warn about function calls with space before parens.
# (Don't put a space between the name of a function and its
@@ -177,7 +184,7 @@ for my $fn (@ARGV) {
$1 ne "void"
[tor-commits] [tor/master] Distribute checkSpaceTest.sh and run it when we have perl.
commit 92a6803e1d20244a98c205c46a4215a67259c7e7 Author: Nick Mathewson Date: Mon Dec 2 12:43:10 2019 -0500 Distribute checkSpaceTest.sh and run it when we have perl. --- Makefile.am | 7 +++ src/test/include.am | 5 + 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 38040a4e7..b01601ecc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,13 @@ EXTRA_DIST+= \ ReleaseNotes\ scripts/maint/checkIncludes.py \ scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c\ + scripts/maint/checkspace_tests/dubious.h\ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ scripts/maint/checkShellScripts.sh \ scripts/maint/practracker/README\ scripts/maint/practracker/exceptions.txt\ diff --git a/src/test/include.am b/src/test/include.am index 6697dbb17..94352c864 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -48,6 +48,11 @@ TESTSCRIPTS += src/test/test_rebind.sh endif endif +if USE_PERL +TESTSCRIPTS += \ +scripts/maint/checkSpaceTest.sh +endif + TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_workqueue \ src/test/test_keygen.sh \ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Have checkSpaceTest.sh exit as skipped when on Windows
commit 8a10a7487006b2484858d3d3a8db491859ca Author: Nick Mathewson Date: Mon Dec 2 12:43:10 2019 -0500 Have checkSpaceTest.sh exit as skipped when on Windows Managing line-ending issues for this one isn't worth it. --- scripts/maint/checkSpaceTest.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/scripts/maint/checkSpaceTest.sh b/scripts/maint/checkSpaceTest.sh index a1eea58eb..e1d207a1a 100755 --- a/scripts/maint/checkSpaceTest.sh +++ b/scripts/maint/checkSpaceTest.sh @@ -7,6 +7,19 @@ umask 077 set -e +# Skip this test if we're running on Windows; we expect line-ending +# issues in that case. +case "$(uname -s)" in +CYGWIN*) WINDOWS=1;; +MINGW*) WINDOWS=1;; +MSYS*) WINDOWS=1;; +*) WINDOWS=0;; +esac +if test "$WINDOWS" = 1; then +# This magic value tells automake that the test has been skipped. +exit 77 +fi + # make a safe space for temporary files DATA_DIR=$(mktemp -d -t tor_checkspace_tests.XX) trap 'rm -rf "$DATA_DIR"' 0 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'pr-1569-squashed'
commit df6c5382ad0c3da45808bf67cec63f40942b561b Merge: a4c22164c 92a6803e1 Author: teor Date: Tue Dec 3 12:57:06 2019 +1000 Merge branch 'pr-1569-squashed' Makefile.am | 7 +++ scripts/maint/checkSpace.pl | 51 --- scripts/maint/checkSpaceTest.sh | 36 +++ scripts/maint/checkspace_tests/dubious.c| 83 + scripts/maint/checkspace_tests/dubious.h| 4 ++ scripts/maint/checkspace_tests/expected.txt | 31 + scripts/maint/checkspace_tests/good_guard.h | 6 ++ scripts/maint/checkspace_tests/same_guard.h | 6 ++ scripts/maint/checkspace_tests/subdir/dubious.c | 1 + src/test/include.am | 5 ++ 10 files changed, 208 insertions(+), 22 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
commit 82cef8032b2a1d4c47c2e1f8ee540b3e04c0b05d Merge: 28c05e0ec 14089a29b Author: teor Date: Tue Dec 3 12:46:54 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
commit 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 Merge: eb8170408 14089a29b Author: teor Date: Tue Dec 3 12:46:58 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
commit df9a1f313799403b813c5645bf5554ee16233517 Merge: 189287e7b 3207a8e5c Author: teor Date: Tue Dec 3 12:47:02 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit dac74fbfab4ca159a7fd4611afd2f131052565fd Merge: 15a2c20e3 792c15fde Author: teor Date: Tue Dec 3 12:45:04 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.0] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
commit 03dc0e19a1a498c7df390899e01b7830e3186b85 Merge: c88fce132 febbc236d Author: teor Date: Tue Dec 3 12:46:47 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 4ded6981bea42e0efe3cd78aca790ca0064c6088 Merge: 90b8c2167 62cf12a8b Author: teor Date: Tue Dec 3 12:46:39 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
commit 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 Merge: eb8170408 14089a29b Author: teor Date: Tue Dec 3 12:46:58 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.0] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.1] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
commit 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 Merge: eb8170408 14089a29b Author: teor Date: Tue Dec 3 12:46:58 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Travis: use -std=gnu99 with NSS, and clang with Chutney
commit 62cf12a8bd66f3795b14466fb7308b1ee24ea0e0 Author: teor Date: Thu Nov 28 11:38:48 2019 +1000 Travis: use -std=gnu99 with NSS, and clang with Chutney NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5. --- .travis.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22732187..aeebbcbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,13 +42,13 @@ matrix: ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" ## We check NSS -## NSS is a fast job, clang is slower on Linux, so we do NSS clang -- env: NSS_OPTIONS="--enable-nss" - compiler: clang -## We run chutney on Linux, because it's faster than chutney on macOS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" +- env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" +## We run chutney on Linux, because it's faster than chutney on macOS +## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .travis.yml index 7f0e78587,51368ea51..f22732187 --- a/.travis.yml +++ b/.travis.yml @@@ -39,12 -32,12 +39,16 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" +## We check NSS +## NSS is a fast job, clang is slower on Linux, so we do NSS clang +- env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@@ -195,16 -136,12 +199,16 @@@ install - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.2'
commit a4c22164c022aee8db962a08039bc6f1c3905585 Merge: f63cf2158 3207a8e5c Author: teor Date: Tue Dec 3 12:47:05 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.9] Travis: use -std=gnu99 in some jobs
commit 792c15fde24a7ae35085d086b66da4f3d867ea4e Author: teor Date: Fri Nov 15 10:17:32 2019 +1000 Travis: use -std=gnu99 in some jobs Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500. --- .travis.yml | 10 +++--- changes/ticket32500 | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..51368ea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,12 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## Turn off some newer features, turn on clang's -Wtypedef-redefinition + env: C_DIALECT_OPTIONS="-std=gnu99" ## We run chutney on Linux, because it's faster than chutney on macOS -- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" +## Use -std=gnu99 to turn off some newer features, and maybe turn on some +## extra gcc warnings? +- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" ## (Linux only) Use an older Linux image (Ubuntu Trusty) ## The Xenial and Bionic images cause permissions issues for chutney, ## this is a workaround, until we fix #32240. @@ -136,8 +140,8 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo "Configure flags are $CONFIGURE_FLAGS" - - ./configure $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\"" + - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS" ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi diff --git a/changes/ticket32500 b/changes/ticket32500 new file mode 100644 index 0..2c0f35df7 --- /dev/null +++ b/changes/ticket32500 @@ -0,0 +1,5 @@ + o Testing: +- Require C99 standards-conforming code in Travis CI, but allow GNU gcc + extensions. Also activates clang's -Wtypedef-redefinition warnings. + Build some jobs with -std=gnu99, and some jobs without. + Closes ticket 32500. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Add new consensus params
commit 7e9265b38361f5b70963c1c079606107e16a758b
Author: Damian Johnson
Date: Mon Dec 2 15:28:15 2019 -0800
Add new consensus params
One new parameter, and another from an earlier commit I missed.
https://gitweb.torproject.org/torspec.git/commit/?id=29a110f
---
stem/descriptor/networkstatus.py | 4
1 file changed, 4 insertions(+)
diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py
index 5f542c2f..cd65da9e 100644
--- a/stem/descriptor/networkstatus.py
+++ b/stem/descriptor/networkstatus.py
@@ -182,6 +182,8 @@ DEFAULT_PARAMS = {
'onion-key-grace-period-days': 7,
'hs_service_max_rdv_failures': 2,
'circ_max_cell_queue_size': 5,
+ 'circpad_max_circ_queued_cells': 1000,
+ 'HiddenServiceEnableIntroDoSDefense': 0,
}
# KeyCertificate fields, tuple is of the form...
@@ -250,6 +252,8 @@ PARAM_RANGE = {
'onion-key-grace-period-days': (1, 90), # max is the highest
onion-key-rotation-days
'hs_service_max_rdv_failures': (1, 10),
'circ_max_cell_queue_size': (1000, 4294967295),
+ 'circpad_max_circ_queued_cells': (0, 5),
+ 'HiddenServiceEnableIntroDoSDefense': (0, 1),
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [nyx/master] Typo correction
commit 6999660fc95cd3ca8690527106adbca466f17a34 Author: Damian Johnson Date: Mon Dec 2 15:21:53 2019 -0800 Typo correction Fixing a typo k0nsl notified me about via email. --- web/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html index fbf5ae5..e9fe5e6 100644 --- a/web/index.html +++ b/web/index.html @@ -285,7 +285,7 @@ E: Unable to locate package nyx Nyx can provide you with information about tor's active connections. This information is retrieved from your system's /proc content or tools such as netstat and lsof. -Unfortunately Tor inadvertently breaks the tools Nyx falls back to through a featurure called https://www.torproject.org/docs/tor-manual.html.en#DisableDebuggerAttachment;>DisableDebuggerAttachment, which makes tor's process memory only readable by root. +Unfortunately Tor inadvertently breaks the tools Nyx falls back to through a feature called https://www.torproject.org/docs/tor-manual.html.en#DisableDebuggerAttachment;>DisableDebuggerAttachment, which makes tor's process memory only readable by root. This leaves you with three options... ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit ba801b987b02e454b2f08a062dea234a406658e2 Author: Translation commit bot Date: Mon Dec 2 21:18:37 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 9f2a60547a..92f09c8565 100644 --- a/fr.po +++ b/fr.po @@ -40,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2019-11-29 02:19+\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-02 21:10+\n" +"Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1028,7 +1028,7 @@ msgstr "_Stockage persistant chiffré" #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326 msgid "Show Passphrase" -msgstr "" +msgstr "Afficher la phrase de passe" #. The label for this placeholder text is not very big, so keep this string #. short. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit e136992cd22ac052864b7e57b77340dc022684d1 Author: Translation commit bot Date: Mon Dec 2 21:17:26 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index c5923ef70b..92f09c8565 100644 --- a/fr.po +++ b/fr.po @@ -40,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2019-11-29 02:19+\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-02 21:10+\n" +"Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate/master] Merge branch 'skirtiadi/43939-faq' of ssh://git.giantrabbit.com/tor/donate into skirtiadi/43939-faq
commit 5b87e60fd6ad5e0a7b7804f8b782ced6390b8586
Merge: 3d10f941 b8b43773
Author: Stephanie Kirtiadi
Date: Wed Nov 27 13:57:23 2019 -0800
Merge branch 'skirtiadi/43939-faq' of ssh://git.giantrabbit.com/tor/donate
into skirtiadi/43939-faq
templates/donor-faq.twig |4 +-
templates/state-disclosures.twig |2 +-
translation/out/messages.pot | 1142 +++---
3 files changed, 193 insertions(+), 955 deletions(-)
diff --cc templates/state-disclosures.twig
index 0fe31a74,d5c8a147..4c6a1f46
--- a/templates/state-disclosures.twig
+++ b/templates/state-disclosures.twig
@@@ -14,9 -14,9 +14,9 @@@
{% trans %}Certain states require written disclosures for nonprofit
organizations soliciting contributions. Individual state disclosures are
below.{% endtrans %}
{% trans %}Florida{% endtrans %}: {% trans %}a copy of the
official registration and financial information may be obtained from the
division of consumer services by calling toll-free, within the state,
1-800-435-7352 (800-HELP-FLA), or visiting www.FloridaConsumerHelp.com.{%
endtrans %} {% trans %}Registration does not imply endorsement, approval, or
recommendation by the state.{% endtrans %} {% trans %}Florida Registration
#CH58356{% endtrans %}
- {% trans %}Georgia{% endtrans %}: {% trans %}A full and fair
description of our programs and our financial statement summary is available
upon request at our office and phone number indicated above.{% endtrans %}
+ {% trans %}Georgia{% endtrans %}: {% trans %}A full and fair
description of our programs and our financial statement summary is available
upon request at the office and phone number +1-844-863-0915.{% endtrans %}
{% trans %}Maryland{% endtrans %}: {% trans %}For the cost of
copies and postage, from the Office of the Secretary of State, State House,
Annapolis, MD 21401.{% endtrans %}
- {% trans %}Nevada{% endtrans %}: {% trans %}Contributions may
be tax deductible pursuant to the provisions of sec. 170(c) of the Internal
Revenue Code of 1986, 26 U.S.C. ¤170(c).{% endtrans %}
+ {% trans %}Nevada{% endtrans %}: {% trans %}Contributions may
be tax deductible pursuant to the provisions of sec. 170(c) of the Internal
Revenue Code of 1986, 26 U.S.C. 170(c).{% endtrans %}
{% trans %}New Jersey{% endtrans %}: {% trans %}Information
filed with the attorney general concerning this charitable solicitation and the
percentage of contributions received by the charity during the last reporting
period that were dedicated to the charitable purpose may be obtained from the
attorney general of the state of New Jersey by calling (973) 504-6215 and is
available on the internet at https://www.state.nj.us/lps/ca/charfrm.htm; target="_blank"
class="hyperlinks links">www.state.nj.us/lps/ca/charfrm.htm.{% endtrans %}
{% trans %}Registration with the attorney general does not imply endorsement.{%
endtrans %}
{% trans %}New York{% endtrans %}: {% trans %}Upon request,
from the Attorney General's Charities Bureau, 28 Liberty Street, New York, NY
10005, 1-212-416-8686 or https://www.charitiesnys.com; target="_blank"
class="hyperlinks links">www.charitiesnys.com.{% endtrans %}
{% trans %}North Carolina{% endtrans %}: {% trans %}Financial
information about this organization and a copy of its license are available
from the State Solicitation Licensing Branch at 1-919-814-5400.{% endtrans %}
{% trans %}The license is not an endorsement by the state.{% endtrans %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate/master] Revision to FAQ and Georgia part of the State Disclosures.
commit 3d10f94175561704361236ddd96eec6204924494
Author: Stephanie Kirtiadi
Date: Wed Nov 27 13:53:36 2019 -0800
Revision to FAQ and Georgia part of the State Disclosures.
Minimum donation to be reported is $20k from $5k. The State
Disclosures for Georgia phone number is now included.
Issue #43939
---
templates/donor-faq.twig | 2 +-
templates/state-disclosures.twig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index d8e0cf48..733261b9 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -173,7 +173,7 @@
{% trans %}Is the Tor Project required to
identify me as a donor to the United States government, or to any other
authority?{% endtrans %}
- {% trans %}If you donate $5,000 or more to the Tor
Project in a single year, we are required to report the donation amount and
your name and address (if we have it) to the IRS, on Schedule B of the Form
990, which is filed annually.{% endtrans %} {% trans %}However, it's normal for
nonprofits to redact individual donor information from the copy of the 990
that's made publicly-available, and that's what we do.{% endtrans %} {% trans
%}We are not required to identify donors to any other organization or
authority, and we do not.{% endtrans %}
+ {% trans %}If you donate $20,000 or more to the
Tor Project in a single year, we are required to report the donation amount and
your name and address (if we have it) to the IRS, on Schedule B of the Form
990, which is filed annually.{% endtrans %} {% trans %}However, it's normal for
nonprofits to redact individual donor information from the copy of the 990
that's made publicly-available, and that's what we do.{% endtrans %} {% trans
%}We are not required to identify donors to any other organization or
authority, and we do not.{% endtrans %}
{% trans %}In your privacy policy, you say you
will never publicly identify me as a donor without my permission.{% endtrans %}
{% trans %}What does that mean?{% endtrans %}
diff --git a/templates/state-disclosures.twig b/templates/state-disclosures.twig
index ae4fa0ec..0fe31a74 100644
--- a/templates/state-disclosures.twig
+++ b/templates/state-disclosures.twig
@@ -14,7 +14,7 @@
{% trans %}Certain states require written disclosures for nonprofit
organizations soliciting contributions. Individual state disclosures are
below.{% endtrans %}
{% trans %}Florida{% endtrans %}: {% trans %}a copy of the
official registration and financial information may be obtained from the
division of consumer services by calling toll-free, within the state,
1-800-435-7352 (800-HELP-FLA), or visiting www.FloridaConsumerHelp.com.{%
endtrans %} {% trans %}Registration does not imply endorsement, approval, or
recommendation by the state.{% endtrans %} {% trans %}Florida Registration
#CH58356{% endtrans %}
- {% trans %}Georgia{% endtrans %}: {% trans %}A full and fair
description of our programs and our financial statement summary is available
upon request at our office and phone number indicated above.{% endtrans %}
+ {% trans %}Georgia{% endtrans %}: {% trans %}A full and fair
description of our programs and our financial statement summary is available
upon request at the office and phone number +1-844-863-0915.{% endtrans %}
{% trans %}Maryland{% endtrans %}: {% trans %}For the cost of
copies and postage, from the Office of the Secretary of State, State House,
Annapolis, MD 21401.{% endtrans %}
{% trans %}Nevada{% endtrans %}: {% trans %}Contributions may
be tax deductible pursuant to the provisions of sec. 170(c) of the Internal
Revenue Code of 1986, 26 U.S.C. ¤170(c).{% endtrans %}
{% trans %}New Jersey{% endtrans %}: {% trans %}Information
filed with the attorney general concerning this charitable solicitation and the
percentage of contributions received by the charity during the last reporting
period that were dedicated to the charitable purpose may be obtained from the
attorney general of the state of New Jersey by calling (973) 504-6215 and is
available on the internet at https://www.state.nj.us/lps/ca/charfrm.htm; target="_blank"
class="hyperlinks links">www.state.nj.us/lps/ca/charfrm.htm.{% endtrans %}
{% trans %}Registration with the attorney general does not imply endorsement.{%
endtrans %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate/master] Fixed some unicode characters
commit b8b43773f1c36164467a0a39e7545b7ef16d41c2
Author: Peter Haight
Date: Tue Nov 26 17:39:33 2019 -0800
Fixed some unicode characters
Some of these unicode characters make the translation script spit out
warnings. We can use these alternatives.
---
templates/donor-faq.twig |4 +-
templates/state-disclosures.twig |2 +-
translation/out/messages.pot | 1142 +++---
3 files changed, 193 insertions(+), 955 deletions(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index d8e0cf48..4ca4de92 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -34,7 +34,7 @@
{% trans %}What is the Tor Project and what
does it do?{% endtrans %}
- {% trans %}The Tor Projectâs mission is 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.{% endtrans
%} {% trans %}The main product of the Tor Project is https://www.torproject.org/download/download-easy.html.en;
target="_blank">Tor Browser, which enables people to browse the internet
anonymously.{% endtrans %} {% trans %}The Tor Project is a 501(c)3 tax-exempt
non-profit organization.{% endtrans %} {% trans %}It was founded in 2006.{%
endtrans %}
+ {% trans %}The Tor Project's mission is 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.{% endtrans %} {% trans
%}The main product of the Tor Project is https://www.torproject.org/download/download-easy.html.en;
target="_blank">Tor Browser, which enables people to browse the internet
anonymously.{% endtrans %} {% trans %}The Tor Project is a 501(c)3 tax-exempt
non-profit organization.{% endtrans %} {% trans %}It was founded in 2006.{%
endtrans %}
{% trans %}Who works for the Tor Project, and
what do they do?{% endtrans %}
@@ -177,7 +177,7 @@
{% trans %}In your privacy policy, you say you
will never publicly identify me as a donor without my permission.{% endtrans %}
{% trans %}What does that mean?{% endtrans %}
- {% trans %}Yes, that's right.{% endtrans %} {%
trans %}If you donate to the Tor Project, there will be some people at the Tor
Project who know about your donation.{% endtrans %} {% trans %}However, we will
never publicly identify you as a donor, unless you have given us permission to
do so.{% endtrans %} {% trans %}That means we won't post your name on our
website, thank you on Twitter, or do anything else that would publicly identify
you as someone who has donated.{% endtrans %} {% trans %}If we decide we would
like to publicly name you as a donor, we will ask you first, and will not do it
until and unless you say it's okay.{% endtrans %} {% trans %}If you talk about
your donation on social media (and we appreciate you doing so!), we will take
that to mean itâs okay for us to engage with or amplify your post.{% endtrans
%}
+ {% trans %}Yes, that's right.{% endtrans %} {%
trans %}If you donate to the Tor Project, there will be some people at the Tor
Project who know about your donation.{% endtrans %} {% trans %}However, we will
never publicly identify you as a donor, unless you have given us permission to
do so.{% endtrans %} {% trans %}That means we won't post your name on our
website, thank you on Twitter, or do anything else that would publicly identify
you as someone who has donated.{% endtrans %} {% trans %}If we decide we would
like to publicly name you as a donor, we will ask you first, and will not do it
until and unless you say it's okay.{% endtrans %} {% trans %}If you talk about
your donation on social media (and we appreciate you doing so!), we will take
that to mean it's okay for us to engage with or amplify your post.{% endtrans
%}
{% trans %}What is your donor privacy policy?{%
endtrans %}
diff --git a/templates/state-disclosures.twig b/templates/state-disclosures.twig
index ae4fa0ec..d5c8a147 100644
--- a/templates/state-disclosures.twig
+++ b/templates/state-disclosures.twig
@@ -16,7 +16,7 @@
{% trans %}Florida{% endtrans %}: {% trans %}a copy of the
official registration and financial information may be obtained from the
division of consumer services by calling toll-free, within the state,
1-800-435-7352 (800-HELP-FLA), or visiting www.FloridaConsumerHelp.com.{%
endtrans %} {% trans %}Registration does not imply endorsement, approval, or
recommendation by the state.{% endtrans %} {% trans %}Florida Registration
#CH58356{% endtrans %}
{% trans %}Georgia{% endtrans %}: {% trans %}A full and fair
description of our programs and our financial
[tor-commits] [donate/master] WIP question 36 is done. 37 and on pending.
commit 743104bc1627a1f173828e01c11b01d5a2621e1f
Author: Stephanie Kirtiadi
Date: Mon Nov 25 17:58:02 2019 -0800
WIP question 36 is done. 37 and on pending.
---
templates/donor-faq.twig | 129 +--
1 file changed, 81 insertions(+), 48 deletions(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index 36948542..368b7d1a 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -18,17 +18,17 @@
{% trans %}How else can I donate to the Tor
Project?{% endtrans %}
- {% trans %}Note: if you wish to donate to the Tor
Project by https://2019.www.torproject.org/donate/donate.html.en;
target="_blank">credit card or PayPal, please click here.{% endtrans %}
+ {% trans %}Note: if you wish to donate to the Tor
Project by https://2019.www.torproject.org/donate/donate.html.en;
target="_blank">credit card or PayPal, please click here.{% endtrans %}
{% trans %}The Tor Project also offers the
following alternative donation methods:{% endtrans %}
-{% trans %}Bitcoin
and Other Cryptocurrencies{% endtrans %}
-{% trans
%}BTCPayServer{% endtrans %}
-https://twitter.com/torproject/status/1196820407950741520;
target="_blank">{% trans %}BottlePay{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.k7269xvazoh5;
target="_blank">{% trans %}Amazon Smile{% endtrans %}
-https://givingassistant.org/np#tor-project-inc;
target="_blank">{% trans %}Giving Assistant{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.rk7dem6f7qd9;
target="_blank">{% trans %}EU Bank Transfer{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.l9u187hxr4lb;
target="_blank">{% trans %}Checks or Money Orders{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.nkvgjbghskyu;
target="_blank">{% trans %}Stock Donation{% endtrans %}
+{% trans %}Bitcoin and Other Cryptocurrencies{% endtrans
%}
+{% trans %}BTCPayServer{% endtrans %}
+https://twitter.com/torproject/status/1196820407950741520;
target="_blank">{% trans %}BottlePay{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.k7269xvazoh5;
target="_blank">{% trans %}Amazon Smile{% endtrans %}
+https://givingassistant.org/np#tor-project-inc; target="_blank">{% trans
%}Giving Assistant{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.rk7dem6f7qd9;
target="_blank">{% trans %}EU Bank Transfer{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.l9u187hxr4lb;
target="_blank">{% trans %}Checks or Money Orders{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.nkvgjbghskyu;
target="_blank">{% trans %}Stock Donation{% endtrans %}
{% trans %}If you have any questions or would like
to receive a thank-you gift after making a donation with one of the methods
above, please email giving(at)torproject.org.{%
endtrans %}
@@ -45,24 +45,24 @@
{% trans %}Can anyone use Tor?{% endtrans
%}
- {% trans %}Yes! Tor is free, and anyone can use
it.{% endtrans %} {% trans %}To get started, you will need to https://www.torproject.org/projects/torbrowser.html.en;>download Tor Browser.{% endtrans %} {% trans %}We
offer instructions on how to download for https://www.torproject.org/projects/torbrowser.html.en#windows;>Windows,
https://www.torproject.org/projects/torbrowser.html.en#macosx;>Mac OS
X and https://www.torproject.org/projects/torbrowser.html.en#linux;>Linux.{%
endtrans %}
+ {% trans %}Yes! Tor is free, and anyone can use
it.{% endtrans %} {% trans %}To get started, you will need to https://www.torproject.org/projects/torbrowser.html.en;>download Tor Browser.{% endtrans %} {% trans %}We
offer instructions on how to download for https://www.torproject.org/projects/torbrowser.html.en#windows;>Windows,
https://www.torproject.org/projects/torbrowser.html.en#macosx;>Mac OS
X, https://www.torproject.org/projects/torbrowser.html.en#linux;>Linux,
and https://www.torproject.org/download/#android;>Android.{% endtrans
%}
{% trans %}What kinds of people support Tor?{%
endtrans %}
- {% trans %}All kinds of people.{% endtrans %} {%
trans %}Thousands of individuals have donated to support the Tor Project, and
we have also received funding from a wide range of organizations including
[tor-commits] [donate/master] WIP
commit 8fe68abedcfa81071eda38007fb8121146484363
Author: Stephanie Kirtiadi
Date: Sun Nov 24 18:00:09 2019 -0800
WIP
---
templates/donor-faq.twig | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index 4b3ede3f..36948542 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -17,8 +17,24 @@
+ {% trans %}How else can I donate to the Tor
Project?{% endtrans %}
+ {% trans %}Note: if you wish to donate to the Tor
Project by https://2019.www.torproject.org/donate/donate.html.en;
target="_blank">credit card or PayPal, please click here.{% endtrans %}
+ {% trans %}The Tor Project also offers the
following alternative donation methods:{% endtrans %}
+
+{% trans %}Bitcoin
and Other Cryptocurrencies{% endtrans %}
+{% trans
%}BTCPayServer{% endtrans %}
+https://twitter.com/torproject/status/1196820407950741520;
target="_blank">{% trans %}BottlePay{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.k7269xvazoh5;
target="_blank">{% trans %}Amazon Smile{% endtrans %}
+https://givingassistant.org/np#tor-project-inc;
target="_blank">{% trans %}Giving Assistant{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.rk7dem6f7qd9;
target="_blank">{% trans %}EU Bank Transfer{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.l9u187hxr4lb;
target="_blank">{% trans %}Checks or Money Orders{% endtrans %}
+https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.nkvgjbghskyu;
target="_blank">{% trans %}Stock Donation{% endtrans %}
+
+ {% trans %}If you have any questions or would like
to receive a thank-you gift after making a donation with one of the methods
above, please email giving(at)torproject.org.{%
endtrans %}
+
+
{% trans %}What is the Tor Project and what
does it do?{% endtrans %}
- {% trans %}The Tor Projects mission is 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.{% endtrans
%} {% trans %}The main product of the Tor Project is https://www.torproject.org/download/download-easy.html.en;>Tor
Browser, which enables people to browse the internet anonymously.{%
endtrans %} {% trans %}The Tor Project is a 501(c)3 tax-exempt non-profit
organization based in Boston, Massachusetts.{% endtrans %} {% trans %}It was
founded in 2006.{% endtrans %}
+ {% trans %}The Tor Projectâs mission is 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.{% endtrans
%} {% trans %}The main product of the Tor Project is https://www.torproject.org/download/download-easy.html.en;
target="_blank">Tor Browser, which enables people to browse the internet
anonymously.{% endtrans %} {% trans %}The Tor Project is a 501(c)3 tax-exempt
non-profit organization.{% endtrans %} {% trans %}It was founded in 2006.{%
endtrans %}
{% trans %}Who works for the Tor Project, and
what do they do?{% endtrans %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate/master] Make background color of unresolved character in campaign counter dark.
commit 949f22e5be22f2d2bbd5bc09f08a0fd6ab6febc0
Author: Stephanie Kirtiadi
Date: Tue Nov 26 14:23:21 2019 -0800
Make background color of unresolved character in campaign counter dark.
The green color for resolved character is bright, and so is the
unresolved color. Now the unresolved cahracter color is dark.
Issue #43959
---
public/dist/index.css | 2 +-
sass/base/_typography.scss | 2 +-
sass/base/_variables.scss | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/public/dist/index.css b/public/dist/index.css
index d3969088..44d00fb3 100644
--- a/public/dist/index.css
+++ b/public/dist/index.css
@@ -1 +1 @@
-/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css
*/html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em
0}figcaption,figure,main{display:block}figure{margin:1em
40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline
dotted}b,strong{font-weight:inherit;font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,in
put,optgroup,select,textarea{margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html
[type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px
dotted
ButtonText}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-but
ton{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}[hidden],template{display:none}hr{border-top:1px
solid #68b030;margin:40px
auto;max-width:106px}body,html,input,textarea{color:#484848;font-family:Source
Sans
Pro,sans-serif;font-size:16px;line-height:20px;font-weight:400}p{font-size:1.3rem;color:#212529;line-height:2rem}.preamble
p{color:#777;font-family:Source Sans
Pro;font-size:2em;line-height:1.3em;font-weight:300}h1{font-size:47px;letter-spacing:2px;line-height:50px;margin-bottom:1%;margin-top:0;text-transform:capitalize}@media
(min-width:767px){h1{font-size:50px;line-height:60px}}@media
(min-width:991px){h1{font-size:55px}}h2{font-size:25px;font-weight:700;line-height:1;margin-bottom:1%;margin-top:0}@media
(min-width:767px){h2{font-size:34px}}h3{font-weight:700}h3,h4{font-size:27px;text-transform:uppercase;margin-bottom:1%;margin-top:0}h4{font-weight:400;letter-spacing:0;line-height:normal}h5{font-size:21
px;font-weight:300;line-height:28px;margin-bottom:1%;margin-top:0;letter-spacing:.09px}@media
(min-width:991px){h5{font-size:22px}}a{color:#7d4698;font-weight:700;text-decoration:none}a:hover{color:#68b030}.bold,b{font-weight:700}.green{color:#68b030}.lime{color:#0f0}.light{font-weight:200}.email{font-weight:700}.small{font-size:14px}.strong{color:#7d4698;font-weight:700}.tiny{font-size:12px}.background-grey{color:#f1f1f3;font-size:80px;font-weight:700}input[type=checkbox]{margin-top:auto;margin-bottom:auto;margin-right:4px}input[type=date],input[type=text],textarea{border:1px
solid #848282;color:#484848;font-size:16px;height:27px;margin:9px;padding:8px
12px}input[type=date].required,input[type=text].required,textarea.required{border-color:#68b030}input[type=date].error,input[type=text].error,textarea.error{border-color:red}input[type=date]::placeholder,input[type=text]::placeholder,textarea::placeholder{color:#848282}input[type=date]:focus,input[type=text]:focus,textarea:focus{bord
er-color:#59316b;color:#7d4698;outline:none}textarea{box-sizing:border-box;width:60%;height:3em;display:block}select,textarea{padding:8px
12px}select{background:#fff;border:1px solid
[tor-commits] [donate/master] Fix links on the FAQ page.
commit c61321245ce4abb6be48e78faa80b3588e1afad6
Author: Stephanie Kirtiadi
Date: Tue Nov 26 16:47:39 2019 -0800
Fix links on the FAQ page.
Issue #43939
---
templates/donor-faq.twig | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index 1482ecdc..d8e0cf48 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -24,11 +24,11 @@
{% trans %}Bitcoin and Other
Cryptocurrencies{% endtrans %}
{% trans %}BTCPayServer{% endtrans
%}
https://twitter.com/torproject/status/1196820407950741520;
target="_blank">{% trans %}BottlePay{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.k7269xvazoh5;
target="_blank">{% trans %}Amazon Smile{% endtrans %}
+https://smile.amazon.com/ch/20-8096820; target="_blank">{% trans %}Amazon
Smile{% endtrans %}
https://givingassistant.org/np#tor-project-inc; target="_blank">{% trans
%}Giving Assistant{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.rk7dem6f7qd9;
target="_blank">{% trans %}EU Bank Transfer{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.l9u187hxr4lb;
target="_blank">{% trans %}Checks or Money Orders{% endtrans %}
-https://docs.google.com/document/d/13APoplGDSGfyj-El12pH8aF1iBGN5ukNhhCQcsLgMZA/edit#bookmark=id.nkvgjbghskyu;
target="_blank">{% trans %}Stock Donation{% endtrans %}
+{% trans %}EU Bank Transfer{% endtrans
%}
+{% trans %}Checks or Money Orders{%
endtrans %}
+{% trans %}Stock Donation{% endtrans %}
{% trans %}If you have any questions or would like
to receive a thank-you gift after making a donation with one of the methods
above, please email giving(at)torproject.org.{%
endtrans %}
@@ -91,7 +91,7 @@
Seattle, WA 98194
Phone number: 206-420-3136
Contact person: Isabela Bagueros, Executive Director{%
endtrans %}
- {% trans %}For European bank
transfers, we have an arrangement with the Renewable Freedom Foundation to
provide tax-deductible donations for Europeans.{% endtrans %} {% trans %}They
will issue a donation receipt https://renewablefreedom.org/contact/;
target="_blank" class="hyperlinks links">upon request.{% endtrans %} {%
trans %}The account information is as follows:{% endtrans %}
+ {%
trans %}For European bank transfers, we have an arrangement with the Renewable
Freedom Foundation to provide tax-deductible donations for Europeans.{%
endtrans %} {% trans %}They will issue a donation receipt https://renewablefreedom.org/contact/; target="_blank" class="hyperlinks
links">upon request.{% endtrans %} {% trans %}The account information is as
follows:{% endtrans %}
{% trans %}Renewable
Freedom Foundation
IBAN: DE1772150053693701
BIC: BYLADEM1ING
@@ -137,11 +137,11 @@
{% trans %}Is there a maximum donation?{%
endtrans %}
{% trans %}Nope.{% endtrans %} {% trans %}More
funding from you means we can do more things we are excited to do, like hire a
person to monitor the Tor network full time, or research, test, and implement
ideas we have for making the Tor network even stronger.{% endtrans %}
-
+
{% trans %}If I want my donation to be
anonymous, what is the best way for me to donate?{% endtrans %}
{% trans %}You can donate by sending us a postal
money order.{% endtrans %} {% trans %}You can donate via bitcoin or another
cryptocurrency if you have it set up in a way that preserves your anonymity.{%
endtrans %} {% trans %}You can buy cash gift cards and mail them to us.{%
endtrans %} {% trans %}There are probably other ways to donate anonymously that
we haven't thought of -- maybe you will.{% endtrans %}
-
+
{% trans %}Can I donate by mail?{% endtrans
%}
{% trans %}Yes.{% endtrans %} {% trans %}Our
mailing address is The Tor Project, 217 First Avenue South #4903, Seattle WA
98194, USA.{% endtrans %}
@@ -159,7 +159,7 @@
{% trans %}Giving Assistant helps you donate a
percentage of your cash back earnings to us with every purchase you make at
3,000+ popular online retailers.{% endtrans %}
{% trans %}https://givingassistant.org/np#tor-project-inc; target="_blank"
class="hyperlinks links">Use Giving Assistant to save money and support the Tor
Project{% endtrans %}
-
+
{% trans %}Can I make a stock donation?{%
endtrans %}
{% trans %}You can donate stock to the Tor
Project.{% endtrans %} {% trans %}Please let us know in advance if you are
transmitting securities via
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 1edff0eb0b1eba7c31046b245daa8c5e1d73c5f5 Author: Translation commit bot Date: Mon Dec 2 19:23:29 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index f2f2e7e6b3..c72b1dc853 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -8687,7 +8687,7 @@ msgstr "" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4 msgid "Close banner" -msgstr "" +msgstr "ÐакÑÑÑÑ Ð±Ð°Ð½Ð½ÐµÑ" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit dfb72696e6b573766186607423ba855f38d43913 Author: Translation commit bot Date: Mon Dec 2 19:22:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ru.po | 35 +++ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index fbf92a9a0e..dc2cf2c877 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -337,6 +337,10 @@ msgid "" "[often turned to by the media for information about how individuals and " "consumers can protect their privacy](https://www.torproject.org/press/)." msgstr "" +"Tor Project Ð¸Ð¼ÐµÐµÑ ÑепÑÑаÑÐ¸Ñ Ð²ÐµÐ´ÑÑего ÑкÑпеÑÑа по ÑеÑевой пÑиваÑноÑÑи. Ðогда " +"ÑеÑÑ Ð·Ð°Ñ Ð¾Ð´Ð¸Ñ Ð¾ заÑиÑе пÑиваÑноÑÑи, [ÑÑедÑÑва маÑÑовой инÑоÑмаÑии ÑаÑÑо " +"обÑаÑаÑÑ Ð½Ð° Tor внимание Ñвоей " +"аÑдиÑоÑии](https://www.torproject.org/press/)." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -371,7 +375,7 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid " Further Reading" -msgstr "" +msgstr " ЧÑо поÑиÑаÑÑ" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -398,12 +402,13 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# Ð ÑоÑговой маÑке и копиÑайÑе" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "Content on this site is Copyright The Tor Project, Inc.." msgstr "" +"ÐвÑоÑÑкие пÑава на ÑодеÑжание ÑÑого ÑайÑа пÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ Tor Project, Inc." #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -775,12 +780,12 @@ msgstr "" #: https//www.torproject.org/about/trademark/trademark-faq/ #: (content/about/trademark/trademark-faq/contents+en.lrtopic.title) msgid "Tor Trademark Frequently Asked Questions" -msgstr "" +msgstr "ЧаÑÑо задаваемÑе вопÑоÑÑ Ð¾ ÑоÑговой маÑке Tor" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4 msgid "Close banner" -msgstr "" +msgstr "ÐакÑÑÑÑ Ð±Ð°Ð½Ð½ÐµÑ" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." @@ -967,7 +972,7 @@ msgstr "обÑÑждение пÑогÑаммного кода Tor и пÑоÑо #: templates/contact.html:11 msgid "Get in touch with other translators" -msgstr "" +msgstr "СвÑзаÑÑÑÑ Ñ Ð´ÑÑгими пеÑеводÑиками" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." @@ -978,6 +983,8 @@ msgstr "" msgid "" "Discuss organization and community related topics: meetups and outreach." msgstr "" +"ÐбÑÑдиÑÑ Ð¾ÑганизаÑионнÑе вопÑоÑÑ, вклÑÑÐ°Ñ Ñе, коÑоÑÑе ÑвÑÐ·Ð°Ð½Ñ Ñ ÑообÑеÑÑвом " +"(вÑÑÑеÑи, пÑодвижение)." #: templates/contact.html:14 msgid "Discuss running a Tor relay." @@ -989,11 +996,11 @@ msgstr "канал Ð´Ð»Ñ ÑообÑеÑÑва акÑивиÑÑов \"глоба #: templates/contact.html:16 msgid "Talk with us about improvements on our websites." -msgstr "" +msgstr "ÐоговоÑиÑÑ Ñ Ð½Ð°Ð¼Ð¸ об ÑлÑÑÑениÑÑ Ð´Ð»Ñ Ð½Ð°ÑÐ¸Ñ Ð²ÐµÐ±-ÑайÑов." #: templates/contact.html:17 msgid "Discuss UX related ideas." -msgstr "" +msgstr "ÐбÑÑдиÑÑ Ð¸Ð´ÐµÐ¸, ÑвÑзаннÑе Ñ UX." #: templates/contact.html:23 msgid "Find us on Social Media" @@ -1060,10 +1067,14 @@ msgid "" "infrastructure, please email tor-secur...@lists.torproject.org. If you've " "found a security bug in Tor or Tor Browser, feel free to submit it for our" msgstr "" +"ÐÑли в каком-Ñо из наÑÐ¸Ñ Ð¿ÑодÑкÑов или наÑей инÑÑаÑÑÑÑкÑÑÑе Ð²Ñ Ð¾Ð±Ð½Ð°ÑÑжили " +"ÑÑзвимоÑÑÑ, пожалÑйÑÑа, ÑвÑжиÑеÑÑ Ñ Ð½Ð°Ð¼Ð¸: tor-secur...@lists.torproject.org." +" ÐÑли Ð²Ñ Ð½Ð°Ñли оÑибкÑ, ÑвÑзаннÑÑ Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑÑÑ, в Tor или Tor Browser, " +"оÑпÑавÑÑе ÑÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð² наÑÑ " #: templates/contact.html:80 msgid "bug bounty program." -msgstr "" +msgstr "пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾ ÑÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¾Ñибок." #: templates/contact.html:80 msgid "" @@ -1150,7 +1161,7 @@ msgstr "Google Play" #: templates/download-tor.html:8 msgid "Tor Source" -msgstr "" +msgstr "Ðод Tor" #: templates/download-tor.html:12 msgid "Version"
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit bc9a25e107561c5c7599fb7e4c2d4511b63903fb Author: Translation commit bot Date: Mon Dec 2 19:20:06 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 94878b6690..21a58f209b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -6,10 +6,10 @@ # Andrey Kostrikov , 2019 # solokot , 2019 # erinm, 2019 -# Sergey Smirnov , 2019 # ÐаÑÐ¸Ñ Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ , 2019 # IvanLykov , 2019 # diana azaryan , 2019 +# Sergey Smirnov , 2019 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: diana azaryan , 2019\n" +"Last-Translator: Sergey Smirnov , 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2134,7 +2134,7 @@ msgstr "" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "ÐакÑÑÑÑ Ð±Ð°Ð½Ð½ÐµÑ" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit 20b2c8b946ef8d7f6d19cbfcace07410a6fd1f0c Author: Translation commit bot Date: Mon Dec 2 18:52:49 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ru.po | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 4d5631e5c1..fbf92a9a0e 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -11,8 +11,8 @@ # solokot , 2019 # e Translators , 2019 # ÐаÑÐ¸Ñ Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ , 2019 -# Sergey Smirnov , 2019 # Emma Peel, 2019 +# Sergey Smirnov , 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Sergey Smirnov , 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -313,6 +313,9 @@ msgid "" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" +"Tor Project вмеÑÑе Ñ ÑообÑеÑÑвом полÑзоваÑелей ÑазÑабаÑÑÐ²Ð°ÐµÑ Ð¸ поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ " +"попÑлÑÑнейÑие беÑплаÑнÑе пÑодÑкÑÑ Ñ Ð¾ÑкÑÑÑÑм кодом Ð´Ð»Ñ Ð·Ð°ÑиÑÑ Ð¿ÑиваÑноÑÑи: " +"Tor Browser и ÑеÑÑ Tor." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -322,6 +325,10 @@ msgid "" "journalists, human rights defenders, librarians, consumers, and average " "internet users about how to protect and retain their privacy online." msgstr "" +"Ðомимо ÑабоÑÑ Ð½Ð°Ð´ ÑÐµÑ Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñми оÑганизаÑÐ¸Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ Ð»ÑдÑм заÑиÑаÑÑ " +"пÑиваÑноÑÑÑ Ð¾Ð½Ð»Ð°Ð¹Ð½. Ðоманда Tor Project помогла ÑÑÑÑÑам акÑивиÑÑов, " +"жÑÑналиÑÑов, пÑавозаÑиÑников, библиоÑекаÑей, поÑÑебиÑелей и пÑоÑÑо инÑеÑнеÑ-" +"полÑзоваÑелей ÑзнаÑÑ Ð¾ Ñом, как заÑиÑиÑÑ Ð¸Ñ Ð¿ÑиваÑноÑÑÑ Ð² ÑеÑи." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] one sentence per line, needed for localization
commit 4ef2beae3f6cb2c48f7026082f770b5a016224ef Author: emma peel Date: Mon Dec 2 19:14:10 2019 +0100 one sentence per line, needed for localization --- .../bridge/debian-ubuntu/contents.lr | 13 +++ .../technical-setup/bridge/docker/contents.lr | 45 -- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 7f302c6..b6c57cd 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -25,17 +25,16 @@ If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installa ``` BridgeRelay 1 -# Replace "TODO1" with a Tor port of your choice. This port must be externally -# reachable. Avoid port 9001 because it's commonly associated with Tor and -# censors may be scanning the Internet for this port. +# Replace "TODO1" with a Tor port of your choice. +# This port must be externally reachable. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO2" with an obfs4 port of your choice. This port must be -# externally reachable and must be different from the one specified for ORPort. -# Avoid port 9001 because it's commonly associated with -# Tor and censors may be scanning the Internet for this port. +# Replace "TODO2" with an obfs4 port of your choice. +# This port must be externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 272afcf..4f88a69 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,8 +8,8 @@ body: ### 1. Pull the image -We are maintaining a docker image that runs an obfs4 bridge. First, -download the image: +We are maintaining a docker image that runs an obfs4 bridge. +First, download the image: ``` docker pull phwinter/obfs4-bridge:latest @@ -17,10 +17,9 @@ docker pull phwinter/obfs4-bridge:latest ### 2. Deploy a container -We provide a Makefile that helps you deploy the container. First, -[download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), -and then write your bridge configuration to a new file, bridge.sh. Here's a -template: +We provide a Makefile that helps you deploy the container. +First, [download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your bridge configuration to a new file, bridge.sh. +Here's a template: ``` # Your bridge's Tor port. @@ -31,9 +30,7 @@ export PT_PORT=Y export EMAIL=Z ``` -Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that -**both** ports are forwarded in your firewall), and `Z` with your email address, -which allows us to get in touch with you if there are problems with your bridge. +Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that **both** ports are forwarded in your firewall), and `Z` with your email address, which allows us to get in touch with you if there are problems with your bridge. With your bridge configuration in place, you can now deploy the container: ``` @@ -47,12 +44,9 @@ You should now see output similar to the following: Make sure that port X and Y are forwarded in your firewall. ``` -That's it! Your container (identified by the first line of output) is now -bootstrapping your new obfs4 bridge. +That's it! Your container (identified by the first line of output) is now bootstrapping your new obfs4 bridge. -If you want to run multiple bridges on your machine, you need to create more -bridge configuration files with different sets of ports, and run `make deploy` -again, like so: +If you want to run multiple bridges on your machine, you need to create more bridge configuration files with different sets of ports, and run `make deploy` again, like so: ``` source bridge-1.sh && make deploy @@ -62,8 +56,7 @@ source bridge-2.sh && make deploy ### 3. Upgrade your container -To upgrade to the latest version of our image, you need to stop your existing -container, delete it, pull the latest image, and finally deploy it again: +To upgrade to the latest version of our image, you need to stop your
[tor-commits] [translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
commit 1ce52d402d9aed6b1b53fee386f5ab56749d1f75 Author: Translation commit bot Date: Mon Dec 2 17:48:41 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- pt_BR.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 5112bc2c7e..15982d6880 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -7,6 +7,7 @@ # carlo giusepe tadei valente sasaki , 2014 # Chacal E., 2019 # drebs , 2014 +# Eduardo Addad de Oliveira , 2019 # Eduardo Bonsi, 2013 # Glauco Machado, 2014 # Isabel Ferreira, 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2019-11-29 03:10+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-12-02 17:42+\n" +"Last-Translator: Eduardo Addad de Oliveira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgstr "No nosso website, nenhuma atualização automática para essa versão es #: ../lib/Tails/IUK/Frontend.pm:242 msgid "your device was not created using a USB image or Tails Installer" -msgstr "" +msgstr "seu dispositivo não foi criado usando uma imagem USB ou o Tails Installer" #: ../lib/Tails/IUK/Frontend.pm:247 msgid "Tails was started from a DVD or a read-only device" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 6d29173f4608b830d03f9faf048a9661623b8412 Author: Translation commit bot Date: Mon Dec 2 16:53:27 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+it.po b/contents+it.po index 84b4aa36ae..e4312f64ba 100644 --- a/contents+it.po +++ b/contents+it.po @@ -9,12 +9,12 @@ # mattia_b89 , 2019 # erinm, 2019 # Giuseppe Curto , 2019 -# Davide Sant , 2019 # SebastianoPistore , 2019 # Giandomenico Lombardi , 2019 # fabio carletti , 2019 # Luke <94lukecatell...@gmail.com>, 2019 # Emma Peel, 2019 +# Davide Sant , 2019 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Davide Sant , 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -9685,12 +9685,12 @@ msgstr "" #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) msgid "You should also consider to use an IRC client." -msgstr "" +msgstr "Dovresti considerare anche l'utilizzo di un client IRC." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.title) msgid "Why I can't join Tor-dev and other channels?" -msgstr "" +msgstr "Perché non posso connettermi a Tor-dev e agli altri canali?" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit cb21bf532083a98d3bb2550a3ca6aee2049b49e6 Author: Translation commit bot Date: Mon Dec 2 16:49:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+it.po b/contents+it.po index dc544d327c..ddf52316c5 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1,6 +1,5 @@ # Translators: # Lorenzo Mazza , 2019 -# Davide Sant , 2019 # Gabriele , 2019 # mattia_b89 , 2019 # Hiro 7 , 2019 @@ -13,6 +12,7 @@ # fabio carletti , 2019 # Random_R, 2019 # Emma Peel, 2019 +# Davide Sant , 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Davide Sant , 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,7 +95,7 @@ msgstr "Avviare il browser Tor per la prima volta" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Pluggable transports" -msgstr "Pluggable transport" +msgstr "Pluggable transports" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -135,7 +135,7 @@ msgstr "Aggiorna" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Plugins" -msgstr "Plugin" +msgstr "Plugins" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Link to mainloop_pubsub.[ch] when describing delivery policies
commit af7416bfad1107a43cafef978674f051f2f5584f Author: Nick Mathewson Date: Mon Dec 2 11:41:16 2019 -0500 Link to mainloop_pubsub.[ch] when describing delivery policies --- src/lib/pubsub/publish_subscribe.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/pubsub/publish_subscribe.md b/src/lib/pubsub/publish_subscribe.md index 019591bc1..bb05b100b 100644 --- a/src/lib/pubsub/publish_subscribe.md +++ b/src/lib/pubsub/publish_subscribe.md @@ -62,6 +62,9 @@ Currently, three delivery policies are possible: dispatch system at all. Instead, some other part of the code must call dispatch_flush() to get the messages delivered. +See mainloop_pubsub.c and mainloop_pubsub.h for more information and +implementation details. + ## Layers: Dispatch vs publish-subsubscribe vs mainloop. At the lowest level, messages are sent via the "dispatcher" module in ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'ticket32207'
commit f63cf2158b22b891a596a1274d1076faf3b69a27 Merge: 53bdd2117 af7416bfa Author: Nick Mathewson Date: Mon Dec 2 11:41:40 2019 -0500 Merge branch 'ticket32207' src/core/mainloop/mainloop_pubsub.h | 32 src/lib/pubsub/publish_subscribe.md | 144 src/mainpage.md | 1 + 3 files changed, 177 insertions(+) diff --cc src/mainpage.md index c5cb1af23,63a5b0a3f..3901e7955 --- a/src/mainpage.md +++ b/src/mainpage.md @@@ -41,8 -41,8 +41,9 @@@ Tor repository @subpage time_periodic -@subpage publish_subscribe +@subpage configuration ++@subpage publish_subscribe @page intro A high-level overview ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Topic documentation on our publish-subscribe architecture.
commit d700dc7801a9e23ddda0d482eeb2b64ced3ca756
Author: Nick Mathewson
Date: Sat Nov 16 14:31:49 2019 -0500
Topic documentation on our publish-subscribe architecture.
---
src/core/mainloop/mainloop_pubsub.h | 32
src/lib/pubsub/publish_subscribe.md | 141
src/mainpage.md | 3 +-
3 files changed, 175 insertions(+), 1 deletion(-)
diff --git a/src/core/mainloop/mainloop_pubsub.h
b/src/core/mainloop/mainloop_pubsub.h
index bd57c0c17..c02127401 100644
--- a/src/core/mainloop/mainloop_pubsub.h
+++ b/src/core/mainloop/mainloop_pubsub.h
@@ -14,9 +14,41 @@
struct pubsub_builder_t;
+/**
+ * Describe when and how messages are delivered on message channel.
+ *
+ * Every message channel must be associated with one of these strategies.
+ **/
typedef enum {
+ /**
+* Never deliver messages automatically.
+*
+* If a message channel uses this strategy, then no matter now many
+* messages are published on it, they are not delivered until something
+* manually calls dispatch_flush() for that channel
+**/
DELIV_NEVER=0,
+ /**
+* Deliver messages promptly, via the event loop.
+*
+* If a message channel uses this strategy, then publishing a messages
+* that channel activates an event that causes messages to be handled
+* later in the mainloop. The messages will be processed at some point
+* very soon, delaying only for pending IO events and the like.
+*
+* Generally this is the best choice for a delivery strategy, since
+* it avoids stack explosion.
+**/
DELIV_PROMPT,
+ /**
+* Deliver messages immediately, skipping the event loop.
+*
+* Every event on this channel is flushed immediately after it is queued,
+* using the stack.
+*
+* This delivery type should be used with caution, since it can cause
+* unexpected call chains, resource starvation, and the like.
+**/
DELIV_IMMEDIATE,
} deliv_strategy_t;
diff --git a/src/lib/pubsub/publish_subscribe.md
b/src/lib/pubsub/publish_subscribe.md
new file mode 100644
index 0..019591bc1
--- /dev/null
+++ b/src/lib/pubsub/publish_subscribe.md
@@ -0,0 +1,141 @@
+
+@page publish_subscribe Publish-subscribe message passing in Tor
+
+@tableofcontents
+
+## Introduction
+
+Tor has introduced a generic publish-subscribe mechanism for delivering
+messages internally. It is meant to help us improve the modularity of
+our code, by avoiding direct coupling between modules that don't
+actually need to invoke one another.
+
+This publish-subscribe mechanism is *not* meant for handing
+multithreading or multiprocess issues, thought we hope that eventually
+it might be extended and adapted for that purpose. Instead, we use
+publish-subscribe today to decouple modules that shouldn't be calling
+each other directly.
+
+For example, there are numerous parts of our code that might need to
+take action when a circuit is completed: a controller might need to be
+informed, an onion service negotiation might need to be attached, a
+guard might need to be marked as working, or a client connection might
+need to be attached. But many of those actions occur at a higher layer
+than circuit completion: calling them directly is a layering violation,
+and makes our code harder to understand and analyze.
+
+But with message-passing, we can invert this layering violation: circuit
+completion can become a "message" that the circuit code publishes, and
+to which higher-level layers subscribe. This means that circuit
+handling can be decoupled from higher-level modules, and stay nice and
+simple. (@ref pubsub_notyet "1")
+
+> @anchor pubsub_notyet 1. Unfortunately, like most of our code, circuit
+> handling is _not_ yet refactored to use publish-subscribe throughout.
+> Instead, layer violations of the type described here are pretty common
+> in Tor today. To see a small part of what happens when a circuit is
+> completed today, have a look at circuit_build_no_more_hops() and its
+> associated code.
+
+## Channels and delivery policies
+
+To work with messages, especially when refactoring existing code, you'll
+need to understand "channels" and "delivery policies".
+
+Every message is delivered on a "message channel". Each channel
+(conceptually) a queue-like structure that can support an arbitrarily
+number of message types. Where channels vary is their delivery
+mechanisms, and their guarantees about when messages are processed.
+
+Currently, three delivery policies are possible:
+
+ - `DELIV_PROMPT` -- causes messages to be processed via a callback in
+ Tor's event loop. This is generally the best choice, since it
+ avoids unexpected growth of the stack.
+
+ - `DELIV_IMMEDIATE` -- causes messages to be processed immediately
+ on the call stack when they are published. This choice grows the
+ stack, and can lead to unexpected complexity in the call graph.
+ We should only use
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 03a383c9231ddc34a37e819185e5911ea4ef3573 Author: Translation commit bot Date: Mon Dec 2 16:20:11 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+lt.po b/contents+lt.po index 9d2c163273..3bcfec9df1 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -959,7 +959,8 @@ msgstr "" #: (content/bridges/contents+en.lrtopic.body) msgid "* Email brid...@torproject.org from a Gmail, or Riseup email address" msgstr "" -"* ParaÅ¡yti laiÅ¡kÄ Ä¯ brid...@torproject.org iÅ¡ Gmail arba Riseup paÅ¡to adresų" +"* ParaÅ¡yti el. laiÅ¡kÄ , adresu brid...@torproject.org iÅ¡ Gmail arba Riseup " +"el. paÅ¡to adreso" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 75e5cb8ce35f80f25e21320d9ccff2782a6103d8 Author: Translation commit bot Date: Mon Dec 2 15:50:05 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index 35dd3ec758..9d2c163273 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -834,8 +834,8 @@ msgid "" "Once you've selected the pluggable transport you'd like to use, click " "'Connect' to save your settings." msgstr "" -"Kai pasirinkote prijungiamÄ jį transportÄ , kurį norÄsite naudoti, spauskite " -"'Prisijungti' iÅ¡saugoti nustatymams." +"PasirinkÄ norimÄ naudoti keiÄiamÄ jį perdavimÄ , spustelÄkite \"Prisijungti\"," +" kad įraÅ¡ytumÄte nustatymus." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -857,8 +857,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, and meek-azure." msgstr "" -"Jeigu bandote apeiti blokuojamÄ ryšį pirmÄ kartÄ , iÅ¡bandykite skirtingus " -"transportus: obfs4, snowflake ir meek-azure." +"Jeigu pirmÄ kartÄ bandote apeiti blokuojamÄ ryšį, iÅ¡bandykite skirtingus " +"perdavimus: obfs4, snowflake ir meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -866,15 +866,17 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "need to enter bridge addresses manually." msgstr "" -"Jei iÅ¡bandÄte visus variantus, bet interneto pasiekti vis tiek negalite, " -"turÄsite tinklo tilto adresus įvesti ranka." +"Jei iÅ¡bandÄte visus Å¡iuos variantus, bet vis tiek negalite prisijungti prie " +"interneto, tuomet turÄsite rankiniu bÅ«du įvesti tinklų tiltų adresus." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "" "Read the [Bridges](/en-US/bridges/) section to learn what bridges are and " "how to obtain them." -msgstr "Paskaitykite [Tinklų Tiltai](/lt/bridges/)" +msgstr "" +"NorÄdami sužinoti kas yra tinklų tiltai ir kaip juos gauti, skaitykite " +"skyrių [Tinklų tiltai](/lt/bridges/)." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) @@ -887,8 +889,8 @@ msgid "" "Most Pluggable Transports, such as obfs4, rely on the use of âbridgeâ " "relays." msgstr "" -"Dauguma prijungiamųjų transportų, kaip obfs4 veikia naudodami \"tinklų " -"tiltų\" retransliacijas." +"Dauguma keiÄiamųjų perdavimų, kaip, pavyzdžiui, obfs4, veikia remdamiesi " +"\"tinklų tilto\" retransliavimo naudojimu." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -896,8 +898,8 @@ msgid "" "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " "of âbridgeâ relays." msgstr "" -"Dauguma [Prijungiamųjų transportų](/lt/circumvention), kaip obfs4 veikia " -"naudodami \"tinklų tiltų\" retransliacijas." +"Dauguma [keiÄiamųjų perdavimų](/lt/circumvention), kaip, pavyzdžiui, obfs4, " +"veikia remdamiesi \"tinklų tilto\" retransliavimo naudojimu." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Update to latest metrics-lib.
commit b1b1aa97fc83012e5d0feed516c8a629c45c01b4 Author: Karsten Loesing Date: Mon Dec 2 16:46:44 2019 +0100 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 87d998c..067add6 16 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 87d998c542688c7e465486de24ef07c1cbece0b0 +Subproject commit 067add639b8cd260b1530a50c81e0e1d0a63e9b0 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Improve runtime performance of hidserv module.
commit 4448f5fc0de60763d42e724036bda8388435af91
Author: Karsten Loesing
Date: Fri Nov 22 09:47:20 2019 +0100
Improve runtime performance of hidserv module.
Fixes #25924.
---
CHANGELOG.md | 5 ++
.../metrics/stats/hidserv/Extrapolator.java| 82 ++
2 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe74cf5..797d54b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changes in version 1.?.? - 2019-1?-??
+ * Medium changes
+ - Improve runtime performance of the hidserv module by storing
+ extrapolated statistics even if computed network fractions are
+ zero, to avoid re-processing these statistics over and over.
+
# Changes in version 1.3.0 - 2019-11-09
diff --git
a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
index 0dcc638..7a44425 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
@@ -197,52 +197,46 @@ public class Extrapolator {
}
}
-/* If we don't know a single consensus with valid-after time in
- * the statistics interval, skip this stat. */
-if (consensuses == 0) {
- continue;
+/* Compute means of network fractions, or assume 0.0 if we don't
+ * know a single consensus with valid-after time in the statistics
+ * interval. */
+double fractionRendRelayedCells = consensuses == 0 ? 0.0
+: sumFractionRendRelayedCells / consensuses;
+double fractionDirOnionsSeen = consensuses == 0 ? 0.0
+: sumFractionDirOnionsSeen / consensuses;
+
+/* Extrapolate network totals. If we don't know a single
+ * consensus, store an empty statistic anyway to avoid processing
+ * these reported statistics over and over. */
+ExtrapolatedHidServStats extrapolated =
+new ExtrapolatedHidServStats(
+statsDateMillis, fingerprint);
+if (fractionRendRelayedCells > 0.0) {
+ extrapolated.setFractionRendRelayedCells(
+ fractionRendRelayedCells);
+ /* Extrapolating cells on rendezvous circuits is as easy as
+ * dividing the reported number by the computed network
+ * fraction. */
+ double extrapolatedRendRelayedCells =
+ stats.getRendRelayedCells() / fractionRendRelayedCells;
+ extrapolated.setExtrapolatedRendRelayedCells(
+ extrapolatedRendRelayedCells);
}
-
-/* Compute means of network fractions. */
-double fractionRendRelayedCells =
-sumFractionRendRelayedCells / consensuses;
-double fractionDirOnionsSeen =
-sumFractionDirOnionsSeen / consensuses;
-
-/* If at least one fraction is positive, extrapolate network
- * totals. */
-if (fractionRendRelayedCells > 0.0
-|| fractionDirOnionsSeen > 0.0) {
- ExtrapolatedHidServStats extrapolated =
- new ExtrapolatedHidServStats(
- statsDateMillis, fingerprint);
- if (fractionRendRelayedCells > 0.0) {
-extrapolated.setFractionRendRelayedCells(
-fractionRendRelayedCells);
-/* Extrapolating cells on rendezvous circuits is as easy as
- * dividing the reported number by the computed network
- * fraction. */
-double extrapolatedRendRelayedCells =
-stats.getRendRelayedCells() / fractionRendRelayedCells;
-extrapolated.setExtrapolatedRendRelayedCells(
-extrapolatedRendRelayedCells);
- }
- if (fractionDirOnionsSeen > 0.0) {
-extrapolated.setFractionDirOnionsSeen(
-fractionDirOnionsSeen);
-/* Extrapolating reported unique .onion addresses to the
- * total number in the network is more difficult. In short,
- * each descriptor is stored to 12 (likely) different
- * directories, so we'll have to divide the reported number by
- * 12 and then by the computed network fraction of this
- * directory. */
-double extrapolatedDirOnionsSeen =
-stats.getDirOnionsSeen() / (12.0 * fractionDirOnionsSeen);
-extrapolated.setExtrapolatedDirOnionsSeen(
-extrapolatedDirOnionsSeen);
- }
- extrapolatedStats.add(extrapolated);
+if (fractionDirOnionsSeen > 0.0) {
+ extrapolated.setFractionDirOnionsSeen(
+ fractionDirOnionsSeen);
+ /* Extrapolating reported unique .onion addresses to the
+ * total number in the network is more difficult. In short,
+ * each descriptor is stored to 12 (likely) different
+
[tor-commits] [collector/master] Remove dependency on metrics-lib's log package (2/4).
commit ea1b1b4f6ab11e7ac933b0e00d5f8c040e4cc11e
Author: Karsten Loesing
Date: Sat Nov 23 17:43:45 2019 +0100
Remove dependency on metrics-lib's log package (2/4).
- Remove unused code.
---
.../persist/WebServerAccessLogPersistence.java | 5 --
.../collector/webstats/InternalLogDescriptor.java | 35 --
.../collector/webstats/LogDescriptorImpl.java | 53 +-
.../metrics/collector/webstats/LogFileMap.java | 26 ---
.../collector/webstats/SanitizeWeblogs.java| 2 +-
.../collector/webstats/WebServerAccessLogImpl.java | 38 +---
6 files changed, 4 insertions(+), 155 deletions(-)
diff --git
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
index 0f862b4..6afb97e 100644
---
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
+++
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
@@ -7,9 +7,6 @@ import org.torproject.descriptor.WebServerAccessLog;
import org.torproject.metrics.collector.webstats.FileType;
import org.torproject.metrics.collector.webstats.InternalWebServerAccessLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.time.format.DateTimeFormatter;
@@ -19,8 +16,6 @@ public class WebServerAccessLogPersistence
public static final String SEP = InternalWebServerAccessLog.SEP;
public static final FileType COMPRESSION = FileType.XZ;
- private static final Logger log
- = LoggerFactory.getLogger(WebServerAccessLogPersistence.class);
private DateTimeFormatter yearPattern = DateTimeFormatter.ofPattern("");
private DateTimeFormatter monthPattern = DateTimeFormatter.ofPattern("MM");
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
b/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
index 3a8a1f0..ac7d689 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
@@ -3,7 +3,6 @@
package org.torproject.metrics.collector.webstats;
-import org.torproject.descriptor.DescriptorParseException;
import org.torproject.descriptor.LogDescriptor;
/**
@@ -17,23 +16,6 @@ public interface InternalLogDescriptor extends LogDescriptor
{
String SEP = "_";
/**
- * Validate log lines.
- *
- * @since 2.2.0
- */
- void validate() throws DescriptorParseException;
-
- /**
- * Set the {@code Validator} that will perform the validation on log
- * lines.
- *
- * Usually set by the implementing class.
- *
- * @since 2.2.0
- */
- void setValidator(Validator validator);
-
- /**
* Set the descriptor's bytes.
*
* @since 2.2.0
@@ -42,22 +24,5 @@ public interface InternalLogDescriptor extends LogDescriptor
{
/** Return the descriptor's preferred compression. */
String getCompressionType();
-
- /**
- * Provides a single function for validating a single log line.
- *
- * @since 2.2.0
- */
- interface Validator {
-
-/**
- * Verifies a log line.
- *
- * @since 2.2.0
- */
-boolean validate(String line);
-
- }
-
}
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
b/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
index d13c85a..c0b0c69 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
@@ -3,25 +3,17 @@
package org.torproject.metrics.collector.webstats;
-import org.torproject.descriptor.Descriptor;
import org.torproject.descriptor.DescriptorParseException;
import org.torproject.descriptor.LogDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
/**
* Base class for log descriptors.
@@ -34,11 +26,6 @@ public abstract class LogDescriptorImpl
/** The log's file name should contain this string. */
public static final String MARKER = ".log";
- private static final int unrecognizedLinesLimit = 3;
-
- private static final Logger log
- = LoggerFactory.getLogger(LogDescriptorImpl.class);
-
private static Pattern filenamePattern = Pattern.compile(
"(?:\\S*)" + MARKER + SEP +
[tor-commits] [collector/master] Remove dependency on metrics-lib's log package (3/4).
commit c11b61465a644940559b97c93a769fda84287970
Author: Karsten Loesing
Date: Sat Nov 23 17:55:17 2019 +0100
Remove dependency on metrics-lib's log package (3/4).
- Remove package-internal interfaces InternalLogDescriptor and
InternalWebServerAccessLog.
---
.../persist/WebServerAccessLogPersistence.java | 4 ++--
.../collector/webstats/InternalLogDescriptor.java | 28 --
.../webstats/InternalWebServerAccessLog.java | 17 -
.../collector/webstats/LogDescriptorImpl.java | 8 +++
.../collector/webstats/SanitizeWeblogs.java| 4 ++--
.../collector/webstats/WebServerAccessLogImpl.java | 4 ++--
6 files changed, 10 insertions(+), 55 deletions(-)
diff --git
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
index 6afb97e..0001957 100644
---
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
+++
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
@@ -5,7 +5,7 @@ package org.torproject.metrics.collector.persist;
import org.torproject.descriptor.WebServerAccessLog;
import org.torproject.metrics.collector.webstats.FileType;
-import org.torproject.metrics.collector.webstats.InternalWebServerAccessLog;
+import org.torproject.metrics.collector.webstats.WebServerAccessLogImpl;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
@@ -14,7 +14,7 @@ import java.time.format.DateTimeFormatter;
public class WebServerAccessLogPersistence
extends DescriptorPersistence {
- public static final String SEP = InternalWebServerAccessLog.SEP;
+ public static final String SEP = WebServerAccessLogImpl.SEP;
public static final FileType COMPRESSION = FileType.XZ;
private DateTimeFormatter yearPattern = DateTimeFormatter.ofPattern("");
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
b/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
deleted file mode 100644
index ac7d689..000
---
a/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2017--2018 The Tor Project
- * See LICENSE for licensing information */
-
-package org.torproject.metrics.collector.webstats;
-
-import org.torproject.descriptor.LogDescriptor;
-
-/**
- * This interface provides methods for internal use only.
- *
- * @since 2.2.0
- */
-public interface InternalLogDescriptor extends LogDescriptor {
-
- /** Logfile name parts separator. */
- String SEP = "_";
-
- /**
- * Set the descriptor's bytes.
- *
- * @since 2.2.0
- */
- void setRawDescriptorBytes(byte[] bytes);
-
- /** Return the descriptor's preferred compression. */
- String getCompressionType();
-}
-
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/InternalWebServerAccessLog.java
b/src/main/java/org/torproject/metrics/collector/webstats/InternalWebServerAccessLog.java
deleted file mode 100644
index 817b8d5..000
---
a/src/main/java/org/torproject/metrics/collector/webstats/InternalWebServerAccessLog.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 The Tor Project
- * See LICENSE for licensing information */
-
-package org.torproject.metrics.collector.webstats;
-
-/**
- * This interface provides methods for internal use only.
- *
- * @since 2.2.0
- */
-public interface InternalWebServerAccessLog extends InternalLogDescriptor {
-
- /** The log's name should include this string. */
- String MARKER = "access.log";
-
-}
-
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
b/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
index c0b0c69..e20be27 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
@@ -20,8 +20,10 @@ import java.util.regex.Pattern;
*
* @since 2.2.0
*/
-public abstract class LogDescriptorImpl
-implements LogDescriptor, InternalLogDescriptor {
+public abstract class LogDescriptorImpl implements LogDescriptor {
+
+ /** Logfile name parts separator. */
+ public static final String SEP = "_";
/** The log's file name should contain this string. */
public static final String MARKER = ".log";
@@ -78,7 +80,6 @@ public abstract class LogDescriptorImpl
}
}
- @Override
public String getCompressionType() {
return this.fileType.name().toLowerCase();
}
@@ -88,7 +89,6 @@ public abstract class LogDescriptorImpl
return this.logBytes;
}
- @Override
public void setRawDescriptorBytes(byte[] bytes) {
this.logBytes = bytes;
}
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
[tor-commits] [collector/master] Remove dependency on metrics-lib's log package (4/4).
commit 8263cc7bdbb0a632f12a84fb2051dd9a25c28142
Author: Karsten Loesing
Date: Sat Nov 23 18:07:41 2019 +0100
Remove dependency on metrics-lib's log package (4/4).
- Remove package-internal abstract class.
---
.../collector/webstats/LogDescriptorImpl.java | 117 -
.../collector/webstats/SanitizeWeblogs.java| 2 +-
.../collector/webstats/WebServerAccessLogImpl.java | 82 +--
3 files changed, 73 insertions(+), 128 deletions(-)
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
b/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
deleted file mode 100644
index e20be27..000
---
a/src/main/java/org/torproject/metrics/collector/webstats/LogDescriptorImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2017--2018 The Tor Project
- * See LICENSE for licensing information */
-
-package org.torproject.metrics.collector.webstats;
-
-import org.torproject.descriptor.DescriptorParseException;
-import org.torproject.descriptor.LogDescriptor;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Base class for log descriptors.
- *
- * @since 2.2.0
- */
-public abstract class LogDescriptorImpl implements LogDescriptor {
-
- /** Logfile name parts separator. */
- public static final String SEP = "_";
-
- /** The log's file name should contain this string. */
- public static final String MARKER = ".log";
-
- private static Pattern filenamePattern = Pattern.compile(
- "(?:\\S*)" + MARKER + SEP + "(?:[0-9a-zA-Z]*)(?:\\.?)([a-zA-Z2]*)");
-
- private final File descriptorFile;
-
- /** Byte array for plain, i.e. uncompressed, log data. */
- private byte[] logBytes;
-
- private FileType fileType;
-
- private List unrecognizedLines = new ArrayList<>();
-
- /**
- * This constructor performs basic operations on the given bytes.
- *
- * An unknown compression type (see {@link #getCompressionType})
- * is interpreted as missing compression. In this case the bytes
- * will be compressed to the given compression type.
- *
- * @since 2.2.0
- */
- protected LogDescriptorImpl(byte[] logBytes, File descriptorFile,
- String logName) throws DescriptorParseException {
-this.logBytes = logBytes;
-this.descriptorFile = descriptorFile;
-try {
- Matcher mat = filenamePattern.matcher(logName);
- if (!mat.find()) {
-throw new DescriptorParseException(
-"Log file name doesn't comply to standard: " + logName);
- }
- this.fileType = FileType.findType(mat.group(1).toUpperCase());
- if (FileType.PLAIN == this.fileType) {
-this.fileType = FileType.XZ;
-this.logBytes = this.fileType.compress(this.logBytes);
- }
-} catch (Exception ex) {
- throw new DescriptorParseException("Cannot parse file "
- + logName + " from file " + descriptorFile.getName(), ex);
-}
- }
-
- @Override
- public InputStream decompressedByteStream() throws DescriptorParseException {
-try {
- return this.fileType.decompress(new ByteArrayInputStream(this.logBytes));
-} catch (Exception ex) {
- throw new DescriptorParseException("Cannot provide deflated stream of "
- + this.descriptorFile + ".", ex);
-}
- }
-
- public String getCompressionType() {
-return this.fileType.name().toLowerCase();
- }
-
- @Override
- public byte[] getRawDescriptorBytes() {
-return this.logBytes;
- }
-
- public void setRawDescriptorBytes(byte[] bytes) {
-this.logBytes = bytes;
- }
-
- @Override
- public int getRawDescriptorLength() {
-return this.logBytes.length;
- }
-
- @Override
- public List getAnnotations() {
-return Collections.emptyList();
- }
-
- @Override
- public List getUnrecognizedLines() {
-return this.unrecognizedLines;
- }
-
- @Override
- public File getDescriptorFile() {
-return descriptorFile;
- }
-
-}
-
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
index 51318f8..fc7c64f 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
@@ -135,7 +135,7 @@ public class SanitizeWeblogs extends CollecTorMain {
private void storeSortedAndForget(String virtualHost, String physicalHost,
LocalDate date, Map lineCounts) {
-String name = new StringJoiner(LogDescriptorImpl.SEP)
+String name = new StringJoiner(WebServerAccessLogImpl.SEP)
.add(virtualHost).add(physicalHost)
.add(WebServerAccessLogImpl.MARKER)
.add(date.format(DateTimeFormatter.BASIC_ISO_DATE))
diff --git
[tor-commits] [collector/master] Remove dependency on metrics-lib's log package (1/4).
commit 859476ecaec2164e0d84bbba4377da11c90034b2
Author: Karsten Loesing
Date: Sat Nov 23 17:13:22 2019 +0100
Remove dependency on metrics-lib's log package (1/4).
- Copy types from metrics-lib to this code base.
- Update package and import statements.
- Copy remaining parts of metrics-lib's FileType.
---
.../persist/WebServerAccessLogPersistence.java | 2 +-
.../metrics/collector/webstats/FileType.java | 44 +
.../collector/webstats/InternalLogDescriptor.java | 63 +++
.../webstats/InternalWebServerAccessLog.java | 17 ++
.../collector/webstats/LogDescriptorImpl.java | 166 +++
.../metrics/collector/webstats/LogMetadata.java| 2 +-
.../collector/webstats/SanitizeWeblogs.java| 4 -
.../collector/webstats/WebServerAccessLogImpl.java | 173
.../collector/webstats/WebServerAccessLogLine.java | 182 +
9 files changed, 647 insertions(+), 6 deletions(-)
diff --git
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
index 848fa2e..0f862b4 100644
---
a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
+++
b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java
@@ -4,8 +4,8 @@
package org.torproject.metrics.collector.persist;
import org.torproject.descriptor.WebServerAccessLog;
-import org.torproject.descriptor.log.InternalWebServerAccessLog;
import org.torproject.metrics.collector.webstats.FileType;
+import org.torproject.metrics.collector.webstats.InternalWebServerAccessLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/FileType.java
b/src/main/java/org/torproject/metrics/collector/webstats/FileType.java
index 79dcf21..15b1e00 100644
--- a/src/main/java/org/torproject/metrics/collector/webstats/FileType.java
+++ b/src/main/java/org/torproject/metrics/collector/webstats/FileType.java
@@ -12,6 +12,8 @@ import
org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -69,10 +71,52 @@ public enum FileType {
}
/**
+ * Compresses the given bytes in memory and returns the compressed bytes.
+ */
+ public byte[] compress(byte[] bytes) throws Exception {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+try (OutputStream os = this.outputStream(baos)) {
+ os.write(bytes);
+ os.flush();
+}
+return baos.toByteArray();
+ }
+
+ /**
+ * Compresses the given InputStream and returns an OutputStream.
+ */
+ public OutputStream compress(OutputStream os) throws Exception {
+return this.outputStream(os);
+ }
+
+ /**
* Decompresses the given InputStream and returns an OutputStream.
*/
public InputStream decompress(InputStream is) throws Exception {
return this.inputStream(is);
}
+
+ /**
+ * Decompresses the given bytes in memory and returns the decompressed bytes.
+ *
+ * @since 2.2.0
+ */
+ public byte[] decompress(byte[] bytes) throws Exception {
+if (0 == bytes.length) {
+ return bytes;
+}
+try (InputStream is
+= this.inputStream(new ByteArrayInputStream(bytes));
+ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ int readByte = is.read();
+ while (readByte > 0) {
+baos.write(readByte);
+readByte = is.read();
+ }
+ baos.flush();
+ return baos.toByteArray();
+}
+ }
+
}
diff --git
a/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
b/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
new file mode 100644
index 000..3a8a1f0
--- /dev/null
+++
b/src/main/java/org/torproject/metrics/collector/webstats/InternalLogDescriptor.java
@@ -0,0 +1,63 @@
+/* Copyright 2017--2018 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.collector.webstats;
+
+import org.torproject.descriptor.DescriptorParseException;
+import org.torproject.descriptor.LogDescriptor;
+
+/**
+ * This interface provides methods for internal use only.
+ *
+ * @since 2.2.0
+ */
+public interface InternalLogDescriptor extends LogDescriptor {
+
+ /** Logfile name parts separator. */
+ String SEP = "_";
+
+ /**
+ * Validate log lines.
+ *
+ * @since 2.2.0
+ */
+ void validate() throws DescriptorParseException;
+
+ /**
+ * Set the {@code Validator} that will perform the validation on log
+ * lines.
+ *
+ * Usually set by the implementing class.
+ *
+ * @since 2.2.0
+ */
+ void setValidator(Validator
[tor-commits] [metrics-web/master] Remove dependency on metrics-lib's index package.
commit 267678c5742379ecbdfdef18ca362d6950fb09d2
Author: Karsten Loesing
Date: Mon Nov 25 16:34:54 2019 +0100
Remove dependency on metrics-lib's index package.
We shouldn't depend on metrics-lib's implementation classes but only
on its provided interfaces. In this case, downloading and parsing an
index.json file is something that we can easily build ourselves using
a POJO and Jackson. Removing this dependency will make it much easier
to refactor metrics-lib.
---
.../metrics/web/CollectorDirectoryProvider.java| 9 +-
.../torproject/metrics/web/DirectoryListing.java | 135 +++--
.../metrics/web/DirectoryListingTest.java | 6 +-
3 files changed, 130 insertions(+), 20 deletions(-)
diff --git
a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
index 2960599..4e20ec5 100644
--- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
+++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
@@ -3,8 +3,6 @@
package org.torproject.metrics.web;
-import org.torproject.descriptor.index.IndexNode;
-
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
@@ -54,9 +52,10 @@ public class CollectorDirectoryProvider implements Runnable {
* produce directory listings as requested. */
@Override
public void run() {
-IndexNode indexNode;
try {
- indexNode = IndexNode.fetchIndex(this.host + "/index/index.json.gz");
+ DirectoryListing directoryListing
+ = DirectoryListing.ofHostString(this.host);
+ this.index.set(directoryListing);
} catch (Exception e) {
/* If we failed to fetch the remote index.json this time, abort the
* update and don't override what we possibly fetched last time. If this
@@ -64,9 +63,7 @@ public class CollectorDirectoryProvider implements Runnable {
* it's a permanent problem, we'll at least serve the last known files.
* Unless it's a permanent problem right from when we started in which
* case there's nothing we can do other than return 500. */
- return;
}
-this.index.set(new DirectoryListing(indexNode));
}
}
diff --git a/src/main/java/org/torproject/metrics/web/DirectoryListing.java
b/src/main/java/org/torproject/metrics/web/DirectoryListing.java
index ceeb2fe..1bb09c2 100644
--- a/src/main/java/org/torproject/metrics/web/DirectoryListing.java
+++ b/src/main/java/org/torproject/metrics/web/DirectoryListing.java
@@ -3,10 +3,18 @@
package org.torproject.metrics.web;
-import org.torproject.descriptor.index.DirectoryNode;
-import org.torproject.descriptor.index.FileNode;
-import org.torproject.descriptor.index.IndexNode;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,20 +35,127 @@ public class DirectoryListing extends HashMap>
extractDirectoryListings();
}
+ /**
+ * Parsed {@code index.json} file, which can be the root node ("index node"),
+ * an inner node ("directory node"), or a leaf node ("file node").
+ */
+ private static class IndexNode implements Comparable {
+
+/**
+ * Relative path from this node's parent node, or the CollecTor host's base
+ * URL if this is the root node.
+ */
+String path;
+
+/**
+ * List of file nodes available in this directory, or {@code null} if this
+ * is a leaf node.
+ */
+SortedSet files;
+
+/**
+ * List of directory nodes in this directory, or {@code null} if this is a
+ * leaf node.
+ */
+SortedSet directories;
+
+/**
+ * Size of the file in bytes if this is a leaf node, or {@code null}
+ * otherwise.
+ */
+Long size;
+
+/**
+ * Timestamp when this file was last modified using pattern
+ * {@code "-MM-DD HH:MM"} in the UTC timezone if this is a leaf node,
or
+ * {@code null} otherwise.
+ */
+String lastModified;
+
+/**
+ * Compare two index nodes by their (relative) path in alphabetic order.
+ *
+ * @param other The other index node to compare to.
+ * @return Comparison result of the two node's paths.
+ */
+@Override
+public int compareTo(IndexNode other) {
+ return this.path.compareTo(other.path);
+}
+ }
+
+ /**
+ * Timeout in milliseconds for reading from remote CollecTor host.
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 15e902800a1bfd86cb30114c4376255206d9b431 Author: Translation commit bot Date: Mon Dec 2 13:50:10 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 7dbe7a7c1e..6b0791f5c3 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -10,6 +10,7 @@ # m tk, 2019 # Caio Volpato , 2019 # Emma Peel, 2019 +# Gus, 2019 # msgid "" msgstr "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Gus, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2083,7 +2084,7 @@ msgid "" "* Note the Library folder is hidden on newer versions of macOS. To navigate " "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu." msgstr "" -"* Observe que a pasta Biblioteca está oculta nas versões mais recentes do " +"* Observe que a pasta Library está oculta nas versões mais recentes do " "macOS. Para navegar para esta pasta no Finder, selecione \"Ir para a pasta " "...\" no menu \"Ir\"." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
commit 4304f381cf18fded6775a2b2c8decb27a29c58fe Author: Translation commit bot Date: Mon Dec 2 13:50:19 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed --- contents+pt-BR.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index d54c7d4268..c26f6fa5bd 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -10,6 +10,7 @@ # m tk, 2019 # Caio Volpato , 2019 # Emma Peel, 2019 +# Gus, 2019 # msgid "" msgstr "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Gus, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 0fdf43e5817b0d77c9aa2fdac38af267d7a749bf Author: Translation commit bot Date: Mon Dec 2 12:15:16 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ar/LC_MESSAGES/bridgedb.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 769782953b..d498585202 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the bridgedb project. # # Translators: +# AbdAlnour Sami , 2019 # Abderrahman Ait Ali , 2017 # A. Hassan , 2015 # Ahmad Gharbeia , 2014 @@ -33,8 +34,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-11-05 13:39+\n" -"Last-Translator: Ahmed IB \n" +"PO-Revision-Date: 2019-12-02 12:00+\n" +"Last-Translator: AbdAlnour Sami \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,11 +100,11 @@ msgstr "Øدد اÙÙÙ" #: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "أظÙر ر٠ز اÙاستجابة اÙسرÙع (QRCode)" +msgstr "أظÙر ر٠ز اÙاستجابة اÙسرÙع (اÙبارÙÙد - QRCode)" #: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "ر٠ز اÙاستجابة اÙسرÙع ÙخطÙØ· اÙÙصÙ" +msgstr "ر٠ز اÙبارÙÙد ÙخطÙØ· اÙÙصÙ" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -116,7 +117,7 @@ msgstr "ÙÙأس٠ÙÙ Ùت٠اÙعثÙر عÙ٠٠ا Ø·Ùبت" #: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Ùبد٠أ٠ÙÙا٠خطأ Ù٠اÙØصÙ٠عÙ٠ر٠ز٠ÙÙإاستجابة اÙسرÙع." +msgstr "Ùبد٠أ٠ÙÙا٠خطأ Ù٠اÙØصÙ٠عÙ٠ر٠ز اÙبارÙÙد." #: bridgedb/distributors/https/templates/bridges.html:73 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui
commit 9bf63fdf91d028789de195f064fb119c4d63cfc7 Author: Translation commit bot Date: Mon Dec 2 11:16:39 2019 + https://gitweb.torproject.org/translation.git/commit/?h=mat-gui --- ia.po | 187 ++ 1 file changed, 187 insertions(+) diff --git a/ia.po b/ia.po new file mode 100644 index 00..f5ae59d9a4 --- /dev/null +++ b/ia.po @@ -0,0 +1,187 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2013-02-04 18:44+\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ia\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:66 mat-gui:422 mat-gui:445 +msgid "Ready" +msgstr "" + +#: mat-gui:136 +msgid "Choose files" +msgstr "" + +#: mat-gui:144 +msgid "Supported files" +msgstr "" + +#: mat-gui:151 +msgid "All files" +msgstr "" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 +msgid "Clean" +msgstr "" + +#: mat-gui:168 +msgid "No metadata found" +msgstr "" + +#: mat-gui:170 mat-gui:419 +msgid "Dirty" +msgstr "" + +#: mat-gui:176 +#, python-format +msgid "%s's metadata" +msgstr "" + +#: mat-gui:187 +msgid "Trash your meta, keep your data" +msgstr "" + +#: mat-gui:192 +msgid "Website" +msgstr "" + +#: mat-gui:219 +msgid "Preferences" +msgstr "" + +#: mat-gui:232 +msgid "Reduce PDF quality" +msgstr "" + +#: mat-gui:235 +msgid "Reduce the produced PDF size and quality" +msgstr "" + +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "" + +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "" + +#: mat-gui:280 +msgid "Unknown" +msgstr "" + +#: mat-gui:325 +msgid "Not-supported" +msgstr "" + +#: mat-gui:339 +msgid "Harmless fileformat" +msgstr "" + +#: mat-gui:341 +msgid "Cant read file" +msgstr "" + +#: mat-gui:343 +msgid "Fileformat not supported" +msgstr "" + +#: mat-gui:346 +msgid "These files can not be processed:" +msgstr "" + +#: mat-gui:351 mat-gui:380 data/mat.glade:239 +msgid "Filename" +msgstr "" + +#: mat-gui:353 +msgid "Reason" +msgstr "" + +#: mat-gui:365 +msgid "Non-supported files in archive" +msgstr "" + +#: mat-gui:379 +msgid "Include" +msgstr "" + +#: mat-gui:397 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "" + +#: mat-gui:413 +#, python-format +msgid "Checking %s" +msgstr "" + +#: mat-gui:428 +#, python-format +msgid "Cleaning %s" +msgstr "" + +#: data/mat.glade:46 +msgid "_File" +msgstr "" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "" + +#: data/mat.glade:187 +msgid "Add" +msgstr "" + +#: data/mat.glade:256 +msgid "State" +msgstr "" + +#: data/mat.glade:294 data/mat.glade:467 +msgid "Metadata" +msgstr "" + +#: data/mat.glade:354 +msgid "Name" +msgstr "" + +#: data/mat.glade:368 +msgid "Content" +msgstr "" + +#: data/mat.glade:398 +msgid "Supported formats" +msgstr "" + +#: data/mat.glade:456 +msgid "Support" +msgstr "" + +#: data/mat.glade:478 +msgid "Method" +msgstr "" + +#: data/mat.glade:489 +msgid "Remaining" +msgstr "" + +#: data/mat.glade:518 +msgid "Fileformat" +msgstr "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
commit 3310bf47f1dfc8c86ebb6afafc8f1b7d559a639f Author: Translation commit bot Date: Mon Dec 2 11:16:22 2019 + https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- ia/ia.po | 533 +++ 1 file changed, 533 insertions(+) diff --git a/ia/ia.po b/ia/ia.po new file mode 100644 index 00..45ce71d2d9 --- /dev/null +++ b/ia/ia.po @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-10-21 09:03+0200\n" +"PO-Revision-Date: 2012-10-03 17:40+\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ia\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../tails_installer/creator.py:100 +msgid "You must run this application as root" +msgstr "" + +#: ../tails_installer/creator.py:146 +msgid "Extracting live image to the target device..." +msgstr "" + +#: ../tails_installer/creator.py:153 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "" + +#: ../tails_installer/creator.py:296 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "" + +#: ../tails_installer/creator.py:315 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "" + +#: ../tails_installer/creator.py:319 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "" + +#: ../tails_installer/creator.py:335 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "" + +#: ../tails_installer/creator.py:341 +msgid "Unknown ISO, skipping checksum verification" +msgstr "" + +#: ../tails_installer/creator.py:353 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "" + +#: ../tails_installer/creator.py:360 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "" + +#: ../tails_installer/creator.py:421 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:435 +msgid "Removing existing Live OS" +msgstr "" + +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:450 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:464 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:512 +#, python-format +msgid "Cannot find device %s" +msgstr "" + +#: ../tails_installer/creator.py:713 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "" + +#: ../tails_installer/creator.py:743 +#, python-format +msgid "" +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "" + +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "" + +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "" + +#: ../tails_installer/creator.py:807 +#, python-format +msgid "Unknown GLib exception while trying to mount device: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:812 +#, python-format +msgid "Unable to mount device: %(message)s" +msgstr "" + +#: ../tails_installer/creator.py:817 +msgid "No mount points found" +msgstr "" + +#: ../tails_installer/creator.py:828 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "" + +#: ../tails_installer/creator.py:838 +#, python-format +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "" + +#: ../tails_installer/creator.py:842 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "" + +#: ../tails_installer/creator.py:853 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "" + +#: ../tails_installer/creator.py:866 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "" + +#: ../tails_installer/creator.py:995 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "" + +#: ../tails_installer/creator.py:998 +msgid "Trying to continue anyway." +msgstr "" + +#: ../tails_installer/creator.py:1007 ../tails_installer/creator.py:1405 +msgid
