[tor-commits] [translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
commit 3ea61648f34ed9190970ebce621de46642bdb9d9 Author: Translation commit bot Date: Fri Sep 13 05:22:52 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- ur/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ur/torcheck.po b/ur/torcheck.po index fbf3611e5..6fb477848 100644 --- a/ur/torcheck.po +++ b/ur/torcheck.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 01:51+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-09-13 05:20+\n" +"Last-Translator: Ali Kamran \n" "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +66,7 @@ msgid "Learn More " msgstr "" msgid "Go" -msgstr "" +msgstr "جائÛÛ" msgid "Donate to Support Tor" msgstr "Ù¹Ùر Ú©Û Ø٠اÛت Ù ÛÚº عطÛÛ Ø¯ÛجÛÛ" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
commit 70db9756ad775d487464accf6cc81fef9783d0fa Author: Translation commit bot Date: Fri Sep 13 04:53:33 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties --- ur/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ur/torlauncher.properties b/ur/torlauncher.properties index 436f2c18d..84c97f8d5 100644 --- a/ur/torlauncher.properties +++ b/ur/torlauncher.properties @@ -41,7 +41,7 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Connect +torlauncher.connect=Ø±Ø§Ø¨Ø·Û Ú©Ø±ÛÚº torlauncher.restart_tor=Restart Tor torlauncher.quit=ÚÚ¾ÙÚدÛجÛÛ (Quit) torlauncher.quit_win=Exit ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
commit 4ada1969f1884fb53ea95ca70c4db06f264eb05a Author: Translation commit bot Date: Fri Sep 13 04:50:13 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd --- ur/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ur/torbrowser_strings.dtd b/ur/torbrowser_strings.dtd index 75009cc92..a894f1459 100644 --- a/ur/torbrowser_strings.dtd +++ b/ur/torbrowser_strings.dtd @@ -25,7 +25,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Update Docker container version to 0.2.
commit 315fcc6bd4d2b6607d8a8b441ddd8036411af110 Author: Philipp Winter Date: Thu Sep 12 14:06:39 2019 -0700 Update Docker container version to 0.2. --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ef601f1..bf5f5b1 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,7 +8,7 @@ body: We are maintaining a docker container that allows you to quickly set up an obfs4 bridge. First, fetch the container: -`docker pull phwinter/obfs4-bridge:0.1` +`docker pull phwinter/obfs4-bridge:0.2` Now, it's time to run the container. We maintain a script that automatically determines a free OR and obfs4 port for you. The script only requires your email address as argument: ``` ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Remove locales
commit 47d28249f91db8816f515fa217a836945158d846 Author: hiro Date: Thu Sep 12 22:21:29 2019 +0200 Remove locales --- community.lektorproject | 30 -- databags/alternatives.ini | 36 2 files changed, 66 deletions(-) diff --git a/community.lektorproject b/community.lektorproject index 7195f39..e75ff45 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -9,33 +9,3 @@ name = English (en) primary = yes url_prefix = / locale = en - -[alternatives.de] -name = Deutsch (de) -url_prefix = /de/ -locale = de - -[alternatives.es] -name = Español -url_prefix = /es/ -locale = es - -[alternatives.fr] -name = Français -url_prefix = /fr/ -locale = fr - -[alternatives.it] -name = Italia (it) -url_prefix = /it/ -locale = it - -[alternatives.pt-BR] -name = Português Br. (pr-BR) -url_prefix = /pt-BR/ -locale = pt-BR - -[alternatives.ru] -name = Ð ÑÑÑкий (ru) -url_prefix = /ru/ -locale = ru diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 1dafc16..5ac0263 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -3,39 +3,3 @@ direction = text-left order = order-last url = / language = English (en) - -[de] -direction = text-left -order = order-last -url = /de/ -language = Deutsch (de) - -[es] -direction = text-left -order = order-last -url = /es/ -language = Español (es) - -[fr] -direction = text-left -order = order-last -url = /fr/ -language = Français (fr) - -[it] -direction = text-left -order = order-last -url = /it/ -language = Italiano (it) - -[pt-BR] -direction = text-left -order = order-last -url = /pt-BR/ -language = Português Br. (pt-BR) - -[ru] -direction = text-left -order = order-last -url = /ru/ -language = Ð ÑÑÑкий (ru) ___ 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 db494c65b476f54cc0afdce19366578733887c80 Author: Translation commit bot Date: Thu Sep 12 19:22:09 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties --- sw/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/torbutton.properties b/sw/torbutton.properties index f05288447..c037a1f44 100644 --- a/sw/torbutton.properties +++ b/sw/torbutton.properties @@ -1,4 +1,4 @@ -torbutton.circuit_display.internet = Internet +torbutton.circuit_display.internet = mtandao torbutton.circuit_display.ip_unknown = IP unknown torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Changes file for ticket31626 (confparse.[ch] move)
commit c7cbe64463cba30586e53e8e5dba9596aba3c67d Author: Nick Mathewson Date: Wed Sep 11 10:25:27 2019 -0400 Changes file for ticket31626 (confparse.[ch] move) --- changes/ticket31626 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket31626 b/changes/ticket31626 new file mode 100644 index 0..443bc1eb8 --- /dev/null +++ b/changes/ticket31626 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: +- Move our backend logic for working with configuration and state + files into a lower-level library, since in no longer depends on + any tor-specific functionality. Closes ticket 31626. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Update #includes to point to confparse.h in its new location.
commit a90d1918af5d2b6c6e6dd2c0797f8a63d4042bfa Author: Nick Mathewson Date: Wed Sep 11 10:17:20 2019 -0400 Update #includes to point to confparse.h in its new location. This commit was automatically generated by running scripts/maint/rectify_include_paths.py . --- src/app/config/config.c | 2 +- src/app/config/statefile.c| 2 +- src/core/or/circuitbuild.c| 2 +- src/core/or/circuitstats.c| 2 +- src/feature/client/entrynodes.c | 2 +- src/feature/control/control_cmd.c | 2 +- src/feature/dirauth/shared_random.c | 2 +- src/feature/dirauth/shared_random_state.c | 2 +- src/feature/hs/hs_dos.c | 2 +- src/lib/confmgt/confparse.c | 2 +- src/test/test_btrack.c| 2 +- src/test/test_config.c| 2 +- src/test/test_confmgr.c | 2 +- src/test/test_confparse.c | 2 +- src/test/test_dir.c | 2 +- src/test/test_entryconn.c | 2 +- src/test/test_entrynodes.c| 2 +- src/test/test_helpers.c | 2 +- src/test/test_options.c | 2 +- src/test/test_pt.c| 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index b4bccd935..bdfa547fd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -61,7 +61,7 @@ #define CONFIG_PRIVATE #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "app/config/statefile.h" #include "app/main/main.h" #include "app/main/subsysmgr.h" diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index bcc06809b..552bd2c44 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -32,7 +32,7 @@ #include "core/or/or.h" #include "core/or/circuitstats.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "core/mainloop/mainloop.h" #include "core/mainloop/netstatus.h" #include "core/mainloop/connection.h" diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index ff809c01c..1daf46871 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -30,7 +30,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "core/crypto/hs_ntor.h" #include "core/crypto/onion_crypto.h" #include "core/crypto/onion_fast.h" diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c index 03eea1d77..7a7f3ca60 100644 --- a/src/core/or/circuitstats.c +++ b/src/core/or/circuitstats.c @@ -29,7 +29,7 @@ #include "core/or/circuitbuild.h" #include "core/or/circuitstats.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "feature/control/control_events.h" #include "lib/crypt_ops/crypto_rand.h" #include "core/mainloop/mainloop.h" diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 54a9238d8..c160c1641 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -114,7 +114,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "app/config/statefile.h" #include "core/mainloop/connection.h" #include "core/mainloop/mainloop.h" diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index ad4a4ef0a..a1d7f825d 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -13,7 +13,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "app/main/main.h" #include "core/mainloop/connection.h" #include "core/or/circuitbuild.h" diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c index 5ccf1a95e..a45f0a29c 100644 --- a/src/feature/dirauth/shared_random.c +++ b/src/feature/dirauth/shared_random.c @@ -90,7 +90,7 @@ #include "core/or/or.h" #include "feature/dirauth/shared_random.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index f2a626c73..76befb0f5 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -12,7 +12,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "lib/crypt_ops/crypto_util.h" #include
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1319'
commit 286b129b09964bbff2bd8f5de7f4edac5f2b4827
Merge: c39c9ce26 c7cbe6446
Author: David Goulet
Date: Thu Sep 12 13:53:59 2019 -0400
Merge branch 'tor-github/pr/1319'
changes/ticket31626 | 4
src/app/config/config.c | 2 +-
src/app/config/statefile.c | 2 +-
src/core/include.am | 2 --
src/core/or/circuitbuild.c | 2 +-
src/core/or/circuitstats.c | 2 +-
src/feature/client/entrynodes.c | 2 +-
src/feature/control/control_cmd.c | 2 +-
src/feature/dirauth/shared_random.c | 2 +-
src/feature/dirauth/shared_random_state.c | 2 +-
src/feature/hs/hs_dos.c | 2 +-
src/lib/confmgt/.may_include| 2 ++
src/{app/config => lib/confmgt}/confparse.c | 2 +-
src/{app/config => lib/confmgt}/confparse.h | 0
src/lib/confmgt/include.am | 2 ++
src/test/test_btrack.c | 2 +-
src/test/test_config.c | 2 +-
src/test/test_confmgr.c | 2 +-
src/test/test_confparse.c | 2 +-
src/test/test_dir.c | 2 +-
src/test/test_entryconn.c | 2 +-
src/test/test_entrynodes.c | 2 +-
src/test/test_helpers.c | 2 +-
src/test/test_options.c | 2 +-
src/test/test_pt.c | 2 +-
25 files changed, 28 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/master] Move confparse.[ch] into src/lib/confmgt/
commit 87ca9e4d2ad16a12d09a8aa37109bc1b16cb126b
Author: Nick Mathewson
Date: Wed Sep 11 10:16:10 2019 -0400
Move confparse.[ch] into src/lib/confmgt/
This commit only does code movement, and does not clean up after
itself. As such, it will break compilation. I'm separating it for
ease of review.
---
src/{app/config => lib/confmgt}/confparse.c | 0
src/{app/config => lib/confmgt}/confparse.h | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/app/config/confparse.c b/src/lib/confmgt/confparse.c
similarity index 100%
rename from src/app/config/confparse.c
rename to src/lib/confmgt/confparse.c
diff --git a/src/app/config/confparse.h b/src/lib/confmgt/confparse.h
similarity index 100%
rename from src/app/config/confparse.h
rename to src/lib/confmgt/confparse.h
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Update include.am files to refer to new location of confparse.[ch]
commit ae6e60281c44cc34189c5f3cd6114aed2b2a9bc4 Author: Nick Mathewson Date: Wed Sep 11 10:22:01 2019 -0400 Update include.am files to refer to new location of confparse.[ch] Tests should now pass again. --- src/core/include.am| 2 -- src/lib/confmgt/include.am | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index 914c370ec..9b4b251c8 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -9,7 +9,6 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. LIBTOR_APP_A_SOURCES = \ src/app/config/config.c \ - src/app/config/confparse.c \ src/app/config/statefile.c \ src/app/main/main.c \ src/app/main/shutdown.c \ @@ -214,7 +213,6 @@ src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/app/config/config.h \ - src/app/config/confparse.h \ src/app/config/or_options_st.h \ src/app/config/or_state_st.h\ src/app/config/statefile.h \ diff --git a/src/lib/confmgt/include.am b/src/lib/confmgt/include.am index aa5b37fdb..81cd868e5 100644 --- a/src/lib/confmgt/include.am +++ b/src/lib/confmgt/include.am @@ -6,6 +6,7 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_confmgt_a_SOURCES = \ + src/lib/confmgt/confparse.c \ src/lib/confmgt/structvar.c \ src/lib/confmgt/type_defs.c \ src/lib/confmgt/typedvar.c \ @@ -18,6 +19,7 @@ src_lib_libtor_confmgt_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ + src/lib/confmgt/confparse.h \ src/lib/confmgt/structvar.h \ src/lib/confmgt/type_defs.h \ src/lib/confmgt/typedvar.h \ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add new entries to lib/confmgt ".may_include" file
commit bf8c3164b6e879f7676374cba6628cd5a79b8cd1 Author: Nick Mathewson Date: Wed Sep 11 10:13:57 2019 -0400 Add new entries to lib/confmgt ".may_include" file confparse.[ch] will need these; checkIncludes confirms that we have not introduced a cycle. --- src/lib/confmgt/.may_include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/confmgt/.may_include b/src/lib/confmgt/.may_include index d85dbf690..256413391 100644 --- a/src/lib/confmgt/.may_include +++ b/src/lib/confmgt/.may_include @@ -7,3 +7,5 @@ lib/encoding/*.h lib/log/*.h lib/malloc/*.h lib/string/*.h +lib/testsupport/*.h +ext/*.h ___ 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 'tor-github/pr/1285'
commit c39c9ce26ba2990177e45a4c7bffaed51d88d280 Merge: 028733e8b 52342327c Author: David Goulet Date: Thu Sep 12 13:47:09 2019 -0400 Merge branch 'tor-github/pr/1285' changes/bug31570 | 5 + src/lib/malloc/map_anon.c | 15 ++- 2 files changed, 19 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] madvise: tolerate EINVAL and ENOSYS
commit 52342327c7e566a25bf69dc6df651de45959e6d6
Author: Nick Mathewson
Date: Mon Sep 2 14:49:53 2019 -0400
madvise: tolerate EINVAL and ENOSYS
These errors can occur if we are built on a system with support for
madvise(MADV_NOFORK) but then we are run on a system whose kernel
does not support that flag.
If the error is something that we don't tolerate at all, we now log
it before crashing.
Fixes bug 31570. I am calling this a bugfix on 0.4.1.1-alpha, where
we actually started using the map_anon code.
---
changes/bug31570 | 5 +
src/lib/malloc/map_anon.c | 15 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/changes/bug31570 b/changes/bug31570
new file mode 100644
index 0..f70b577b4
--- /dev/null
+++ b/changes/bug31570
@@ -0,0 +1,5 @@
+ o Major bugfixes (crash, android):
+- Tolerate systems (including some Android installations) where madvise
+ and MADV_DONTDUMP are available at build-time, but not at run time.
+ Previously, these systems would notice a failed syscall and abort.
+ Fixes bug 31570; bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c
index 0f6a4150c..79bbb99f7 100644
--- a/src/lib/malloc/map_anon.c
+++ b/src/lib/malloc/map_anon.c
@@ -27,6 +27,9 @@
#include
#endif
+#include
+#include
+
/**
* Macro to get the high bytes of a size_t, if there are high bytes.
* Windows needs this; other operating systems define a size_t that does
@@ -108,7 +111,17 @@ static int
nodump_mem(void *mem, size_t sz)
{
#if defined(MADV_DONTDUMP)
- return madvise(mem, sz, MADV_DONTDUMP);
+ int rv = madvise(mem, sz, MADV_DONTDUMP);
+ if (rv == 0) {
+return 0;
+ } else if (errno == ENOSYS || errno == EINVAL) {
+return 0; // syscall not supported, or flag not supported.
+ } else {
+tor_log_err_sigsafe("Unexpected error from madvise: ",
+strerror(errno),
+NULL);
+return -1;
+ }
#else
(void) mem;
(void) sz;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Fix breadcrumbs
commit ecdb5013c3030e20b79d9509e07980e6afe800cb
Author: hiro
Date: Thu Sep 12 18:25:30 2019 +0200
Fix breadcrumbs
---
content/relay-operations/technical-setup/guard/contents.lr | 2 ++
lego | 2 +-
templates/breadcrumb.html | 1 +
templates/macros/parent.html | 1 +
templates/macros/resources.html| 9 +
templates/two-columns-page.html| 1 +
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/content/relay-operations/technical-setup/guard/contents.lr
b/content/relay-operations/technical-setup/guard/contents.lr
index 7cfa3dd..2e4fb97 100644
--- a/content/relay-operations/technical-setup/guard/contents.lr
+++ b/content/relay-operations/technical-setup/guard/contents.lr
@@ -1,5 +1,7 @@
_model: page
---
+color: primary
+---
title: Middle/Guard relay
---
body: In this guide we describe how to setup a new Middle/Guard relay. Please
choose your platform below.
diff --git a/lego b/lego
index 3d80025..8cb5f20 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763
+Subproject commit 8cb5f20089a163b0a5134d841248778cb518bdf2
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
new file mode 12
index 000..583e450
--- /dev/null
+++ b/templates/breadcrumb.html
@@ -0,0 +1 @@
+../lego/templates/breadcrumb.html
\ No newline at end of file
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
new file mode 12
index 000..14b7799
--- /dev/null
+++ b/templates/macros/parent.html
@@ -0,0 +1 @@
+../../lego/templates/macros/parent.html
\ No newline at end of file
diff --git a/templates/macros/resources.html b/templates/macros/resources.html
deleted file mode 100644
index e632faf..000
--- a/templates/macros/resources.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro render_resource(item) %}
-
-{{ item.file }}
-{{ item.description }}
-{{ item.type}}
-{{ item.date }}
-
-{% endmacro %}
diff --git a/templates/macros/resources.html b/templates/macros/resources.html
new file mode 12
index 000..fa7524a
--- /dev/null
+++ b/templates/macros/resources.html
@@ -0,0 +1 @@
+../../lego/templates/macros/resources.html
\ No newline at end of file
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 199a452..a4fa3f6 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -1,6 +1,7 @@
{% include 'sidenav.html' %}
+{% include 'breadcrumb.html' %}
{{ this.body }}
{% for child in this.children|sort(attribute='key') %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits
commit 64d21f9ff02b219217e4228abff0d48f41a0ac00 Author: Translation commit bot Date: Thu Sep 12 16:20:00 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits --- ja/onioncircuits.pot | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/onioncircuits.pot b/ja/onioncircuits.pot index 58113209e..48e33b547 100644 --- a/ja/onioncircuits.pot +++ b/ja/onioncircuits.pot @@ -6,13 +6,14 @@ # 323484, 2018 # maruyuki , 2016 # nord stream , 2016 +# ue zaeco, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-12-13 13:44+\n" -"Last-Translator: 323484\n" +"PO-Revision-Date: 2019-09-12 15:52+\n" +"Last-Translator: ue zaeco\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +78,7 @@ msgstr "ãã£ã³ã¬ã¼ããªã³ã:" #: ../onioncircuits:608 msgid "Published:" -msgstr "å ¬éãããï¼" +msgstr "å ¬éæ¥æ:" #: ../onioncircuits:609 msgid "IP:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_completed
commit f7e78fe2f89c63cafef1f7ecb041327868e6103f Author: Translation commit bot Date: Thu Sep 12 16:20:10 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_completed --- ja/onioncircuits.pot | 37 +++-- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/ja/onioncircuits.pot b/ja/onioncircuits.pot index 58113209e..9b368ba78 100644 --- a/ja/onioncircuits.pot +++ b/ja/onioncircuits.pot @@ -6,13 +6,14 @@ # 323484, 2018 # maruyuki , 2016 # nord stream , 2016 +# ue zaeco, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-12-13 13:44+\n" -"Last-Translator: 323484\n" +"PO-Revision-Date: 2019-09-12 15:52+\n" +"Last-Translator: ue zaeco\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,67 +23,67 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "ã¾ã Torã«æ¥ç¶ãã¦ãã¾ããã" +msgstr "" #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion ãµã¼ããã" +msgstr "" #: ../onioncircuits:125 msgid "Circuit" -msgstr "ãµã¼ããã" +msgstr "" #: ../onioncircuits:126 msgid "Status" -msgstr "ç¶æ " +msgstr "" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "ãµã¼ããããã¯ãªãã¯ã㦠Tor ãªã¬ã¼ã®è©³ç´°ã表示ãã¾ãã" +msgstr "" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "Torã¸ã®æ¥ç¶ã失ããã¾ããâ¦" +msgstr "" #: ../onioncircuits:317 msgid "..." -msgstr "â¦" +msgstr "" #: ../onioncircuits:343 #, c-format msgid "%s: %s" -msgstr "%s: %s" +msgstr "" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "GeoIPãã¼ã¿ãã¼ã¹ãå©ç¨ã§ãã¾ãããå½åæ å ±ã¯è¡¨ç¤ºããã¾ããã" +msgstr "" #: ../onioncircuits:585 #, c-format msgid "%s (%s)" -msgstr "%s (%s)" +msgstr "" #: ../onioncircuits:590 #, c-format msgid "%.2f Mb/s" -msgstr "%.2f Mb/s" +msgstr "" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "ä¸æ" +msgstr "" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "ãã£ã³ã¬ã¼ããªã³ã:" +msgstr "" #: ../onioncircuits:608 msgid "Published:" -msgstr "å ¬éãããï¼" +msgstr "" #: ../onioncircuits:609 msgid "IP:" -msgstr "IP:" +msgstr "" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "帯åå¹ :" +msgstr "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit fb60cdb033c73b78967a7bd4964b7667e9b80fa9
Author: hiro
Date: Thu Sep 12 18:16:13 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 30d7ed7..c411d5a 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,6 +1,6 @@
{% macro render_parent(item) %}
-
+
{{ item.parent.title }}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit ae8465f4a3508e847e4a3209791f9bf7e1abb5b8
Author: hiro
Date: Thu Sep 12 18:15:44 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 33 +++--
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 1db15e4..30d7ed7 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,20 +1,25 @@
+{% macro render_parent(item) %}
+
+
+ {{ item.parent.title }}
+
+
+{% endmacro %}
+
{% macro render_parents(item) %}
- {% set vars = {'parent': item.parent, 'item': item } %}
{% if item.parent %}
-{% for _ in range(1, 5) %}
- {% if vars.update({'parent': item.parent}) %} {% endif %}
- {% if vars.parent %}
-{% if vars.parent.path == "/" %}
- {# break #}
-{% else %}
-
-
- {{ vars.parent.title }}
-
-
+{{ render_parent(item) }}
+{% set item = item.parent %}
+{% if item.parent %}
+ {{ render_parent(item) }}
+ {% set item = item.parent %}
+ {% if item.parent %}
+{{ render_parent(item) }}
+{% set item = item.parent %}
+{% if item.parent %}
+ {{ render_parent(item) }}
{% endif %}
{% endif %}
- {% if vars.update({'item': vars.parent}) %} {% endif %}
-{% endfor %}
+{% endif %}
{% endif %}
{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit a6ee2f2d78b5cafd91174cca31508c1240934a62
Author: hiro
Date: Thu Sep 12 18:09:41 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 8447725..1db15e4 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -4,12 +4,12 @@
{% for _ in range(1, 5) %}
{% if vars.update({'parent': item.parent}) %} {% endif %}
{% if vars.parent %}
-{% if vars.parentvars.parentvars.parent.path == "/" %}
+{% if vars.parent.path == "/" %}
{# break #}
{% else %}
- {{ vars.parentvars.parent.title }}
+ {{ vars.parent.title }}
{% endif %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit ed618906bb08785075953ae9a47928c7f600207d
Author: hiro
Date: Thu Sep 12 18:09:00 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 7215499..8447725 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,11 +1,20 @@
{% macro render_parents(item) %}
-
+ {% set vars = {'parent': item.parent, 'item': item } %}
{% if item.parent %}
{% for _ in range(1, 5) %}
- {% set parent = item.parent %}
- {{ parent }}
- {{ item }}
- {% set item = item.parent %}
+ {% if vars.update({'parent': item.parent}) %} {% endif %}
+ {% if vars.parent %}
+{% if vars.parentvars.parentvars.parent.path == "/" %}
+ {# break #}
+{% else %}
+
+
+ {{ vars.parentvars.parent.title }}
+
+
+{% endif %}
+ {% endif %}
+ {% if vars.update({'item': vars.parent}) %} {% endif %}
{% endfor %}
{% endif %}
{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 2a33ca6a5484638161d0326459910e305d5f7432
Author: hiro
Date: Thu Sep 12 18:00:16 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index d72db17..7215499 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -3,17 +3,8 @@
{% if item.parent %}
{% for _ in range(1, 5) %}
{% set parent = item.parent %}
- {% if parent %}
-{% if parent.path == "/" %}
- {# break #}
-{% else %}
-
-
- {{ parent.title }}
-
-
-{% endif %}
- {% endif %}
+ {{ parent }}
+ {{ item }}
{% set item = item.parent %}
{% endfor %}
{% endif %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit d88cb2192648457ba42a8c91c762e3be7d0b89d0
Author: hiro
Date: Thu Sep 12 17:59:04 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 23 ++-
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 278d470..d72db17 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,7 +1,20 @@
{% macro render_parents(item) %}
-
-
- {{ item.parent.title }}
-
-
+
+ {% if item.parent %}
+{% for _ in range(1, 5) %}
+ {% set parent = item.parent %}
+ {% if parent %}
+{% if parent.path == "/" %}
+ {# break #}
+{% else %}
+
+
+ {{ parent.title }}
+
+
+{% endif %}
+ {% endif %}
+ {% set item = item.parent %}
+{% endfor %}
+ {% endif %}
{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 86681dcc81b77be8e3c03f589920b1fa49f3bd82
Author: hiro
Date: Thu Sep 12 17:54:22 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index a6333dd..278d470 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,9 +1,7 @@
{% macro render_parents(item) %}
- {% if item.parent %}
-
-
-{{ parent.title }}
-
-
- {% endif %}
+
+
+ {{ item.parent.title }}
+
+
{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
commit ae8a608f2c625d18e799e1ab816bdecdf7b08dd7 Author: Translation commit bot Date: Thu Sep 12 15:53:30 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings --- ja/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 1f22ffad9..1107994be 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -29,7 +29,7 @@ - + @@ -52,7 +52,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 02e4f3b269e2246d0bbed1692a2d09c18c788028
Author: hiro
Date: Thu Sep 12 17:53:25 2019 +0200
Update to breadcrumbs
---
templates/macros/parent.html | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index 9625824..a6333dd 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -1,19 +1,9 @@
{% macro render_parents(item) %}
{% if item.parent %}
-{% for _ in range(1, 5) %}
- {% set parent = item.parent %}
- {% if parent %}
-{% if parent.path == "/" %}
- {# break #}
-{% else %}
-
-
- {{ parent.title }}
-
-
-{% endif %}
- {% endif %}
- {% set item = item.parent %}
-{% endfor %}
+
+
+{{ parent.title }}
+
+
{% endif %}
{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
commit 6f246e6e2b7d8f1b836e9c1b6658e3ca9c680ffc Author: Translation commit bot Date: Thu Sep 12 15:53:36 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed --- ja/network-settings.dtd | 104 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 1f22ffad9..1e0a75666 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -1,62 +1,62 @@ - - - - + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 21b15a1ec645707de22bfa2fc297ac898fc29358
Author: hiro
Date: Thu Sep 12 17:48:26 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html| 19 ++-
templates/macros/parent.html | 19 +++
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index 56ba19d..40fb3cf 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -1,22 +1,7 @@
-{% if this.parent %}
- {% set parent = this.parent %}
- {% for _ in range(1, 5) %}
-{% if parent %}
- {% if parent.path == "/" %}
-{# break #}
- {% else %}
-
-
-{{ parent.title }}
-
-
- {% endif %}
-{% endif %}
-{% set parent = parent.parent %}
- {% endfor %}
-{% endif %}
+{% from "macros/parent.html" import render_parents %}
+{{ render_parents(this) }}
{{ this.title
}}
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
index e69de29..9625824 100644
--- a/templates/macros/parent.html
+++ b/templates/macros/parent.html
@@ -0,0 +1,19 @@
+{% macro render_parents(item) %}
+ {% if item.parent %}
+{% for _ in range(1, 5) %}
+ {% set parent = item.parent %}
+ {% if parent %}
+{% if parent.path == "/" %}
+ {# break #}
+{% else %}
+
+
+ {{ parent.title }}
+
+
+{% endif %}
+ {% endif %}
+ {% set item = item.parent %}
+{% endfor %}
+ {% endif %}
+{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 6daffa6d873f18480bea98b9f2ceb51c5adaa592 Author: Translation commit bot Date: Thu Sep 12 15:45:07 2019 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index cd555fd4b..9ed3c9913 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -23,7 +23,7 @@ - + https://www.torproject.org/getinvolved/volunteer.html.en;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update templates
commit a2d4d810d71f07b0e6045e957a98f46892bfa6a2
Author: hiro
Date: Thu Sep 12 17:44:25 2019 +0200
Update templates
---
templates/macros/parent.html| 0
templates/macros/resources.html | 8
2 files changed, 8 insertions(+)
diff --git a/templates/macros/parent.html b/templates/macros/parent.html
new file mode 100644
index 000..e69de29
diff --git a/templates/macros/resources.html b/templates/macros/resources.html
new file mode 100644
index 000..e632faf
--- /dev/null
+++ b/templates/macros/resources.html
@@ -0,0 +1,8 @@
+{% macro render_resource(item) %}
+
+{{ item.file }}
+{{ item.description }}
+{{ item.type}}
+{{ item.date }}
+
+{% endmacro %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit b70cb754bffeff3ab6a7cbb973b7b5d211441bf5
Author: hiro
Date: Thu Sep 12 17:40:25 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index ca7cb45..56ba19d 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -12,9 +12,9 @@
{{ parent.title }}
-{% parent = parent.parent %}
{% endif %}
{% endif %}
+{% set parent = parent.parent %}
{% endfor %}
{% endif %}
{{ this.title
}}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 965d08fc7fcafcbfff3c4cf45f14308f792c510e
Author: hiro
Date: Thu Sep 12 17:38:29 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index bf6ca88..ca7cb45 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -12,7 +12,7 @@
{{ parent.title }}
-{% set parent = parent.parent %}
+{% parent = parent.parent %}
{% endif %}
{% endif %}
{% endfor %}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 97194ff8adaa0c9f9a59515a016215b87c7550e7
Author: hiro
Date: Thu Sep 12 17:36:58 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index ecb9f88..bf6ca88 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -1,18 +1,22 @@
-{% set parent = this.parent %}
-{% for _ in range(1, 10) %}
- {% if parent.path == "/" %}
-{% break %}
- {% else %}
-
-
-{{ parent.title }}
-
-
-{% set parent = parent.parent %}
- {% endif %}
-{% endfor %}
+{% if this.parent %}
+ {% set parent = this.parent %}
+ {% for _ in range(1, 5) %}
+{% if parent %}
+ {% if parent.path == "/" %}
+{# break #}
+ {% else %}
+
+
+{{ parent.title }}
+
+
+{% set parent = parent.parent %}
+ {% endif %}
+{% endif %}
+ {% endfor %}
+{% endif %}
{{ this.title
}}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 2efff734ab17d359115fe18688198d56fa8bb5c9
Author: hiro
Date: Thu Sep 12 17:19:20 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index 210cb03..ecb9f88 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -1,12 +1,18 @@
-{% if this.parent %}
-
-
- {{ this.parent.title }}
-
-
-{% endif %}
+{% set parent = this.parent %}
+{% for _ in range(1, 10) %}
+ {% if parent.path == "/" %}
+{% break %}
+ {% else %}
+
+
+{{ parent.title }}
+
+
+{% set parent = parent.parent %}
+ {% endif %}
+{% endfor %}
{{ this.title
}}
___
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 'tor-github/pr/1303'
commit 028733e8b6f36bae420b1e41897401fa3b14ccf8
Merge: 3aaa4d416 ebce7059f
Author: George Kadianakis
Date: Thu Sep 12 18:09:35 2019 +0300
Merge branch 'tor-github/pr/1303'
changes/bug31594| 5 +++
src/lib/err/backtrace.c | 2 +-
src/lib/err/torerr.c| 64 +++---
src/lib/err/torerr.h| 7 ++--
src/lib/err/torerr_sys.c| 5 ++-
src/lib/log/log.c | 85 +++--
src/lib/log/log.h | 1 +
src/lib/log/util_bug.c | 11 +++---
src/trunnel/trunnel-local.h | 1 +
9 files changed, 158 insertions(+), 23 deletions(-)
diff --cc src/lib/err/torerr.c
index 48fcf35e0,21b28a5f6..0a4ee5d41
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@@ -163,14 -206,20 +207,26 @@@ tor_raw_assertion_failed_msg_(const cha
}
dump_stack_symbols_to_error_fds();
+
+ /* Some platforms (macOS, maybe others?) can swallow the last write before
an
+ * abort. This issue is probably caused by a race condition between write
+ * buffer cache flushing, and process termination. So we write an extra
+ * newline, to make sure that the message always gets through. */
+ tor_log_err_sigsafe_write("\n");
}
+ /**
+ * Call the abort() function to kill the current process with a fatal
+ * error. But first, close the raw error file descriptors, so error messages
+ * are written before process termination.
+ **/
+ void
+ tor_raw_abort_(void)
+ {
+ tor_log_close_sigsafe_err_fds();
+ abort();
+ }
+
/* As format_{hex,dex}_number_sigsafe, but takes a radix argument
* in range 2..16 inclusive. */
static int
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] changes: file for 31594
commit ebce7059ffbc3a4a8b7ff7cf923b0e6a402f4f33 Author: teor Date: Mon Sep 9 13:53:58 2019 +1000 changes: file for 31594 --- changes/bug31594 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug31594 b/changes/bug31594 new file mode 100644 index 0..75e6ec33c --- /dev/null +++ b/changes/bug31594 @@ -0,0 +1,5 @@ + o Minor bugfixes (error handling): +- When tor aborts due to an error, close log file descriptors before + aborting. Closing the logs makes some OSes flush log file buffers, + rather than deleting buffered log lines. Fixes bug 31594; + bugfix on 0.2.5.2-alpha. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] torerr: Close sigsafe fds on shutdown
commit d02ced4cafaed5b11079585f03f47e73034dd980
Author: teor
Date: Wed Sep 4 14:54:08 2019 +1000
torerr: Close sigsafe fds on shutdown
And clear the list of error fds.
Part of 31594.
---
src/lib/err/torerr.c | 42 --
src/lib/err/torerr.h | 1 +
src/lib/err/torerr_sys.c | 5 -
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index ecffb7f7b..2c4a10a5b 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -110,6 +110,8 @@ tor_log_get_sigsafe_err_fds(const int **out)
* Update the list of fds that get errors from inside a signal handler or
* other emergency condition. Ignore any beyond the first
* TOR_SIGSAFE_LOG_MAX_FDS.
+ *
+ * If fds is NULL or n is 0, clears the list of error fds.
*/
void
tor_log_set_sigsafe_err_fds(const int *fds, int n)
@@ -118,8 +120,18 @@ tor_log_set_sigsafe_err_fds(const int *fds, int n)
n = TOR_SIGSAFE_LOG_MAX_FDS;
}
- memcpy(sigsafe_log_fds, fds, n * sizeof(int));
- n_sigsafe_log_fds = n;
+ /* Clear the entire array. This code mitigates against some race conditions,
+ * but there are still some races here:
+ * - err logs are disabled while the array is cleared, and
+ * - a thread can read the old value of n_sigsafe_log_fds, then read a
+ * partially written array.
+ * We could fix these races using atomics, but atomics use the err module. */
+ n_sigsafe_log_fds = 0;
+ memset(sigsafe_log_fds, 0, sizeof(sigsafe_log_fds));
+ if (fds && n > 0) {
+memcpy(sigsafe_log_fds, fds, n * sizeof(int));
+n_sigsafe_log_fds = n;
+ }
}
/**
@@ -133,6 +145,32 @@ tor_log_reset_sigsafe_err_fds(void)
}
/**
+ * Close the list of fds that get errors from inside a signal handler or
+ * other emergency condition. These fds are shared with the logging code:
+ * closing them flushes the log buffers, and prevents any further logging.
+ *
+ * This function closes stderr, so it should only be called immediately before
+ * process shutdown.
+ */
+void
+tor_log_close_sigsafe_err_fds(void)
+{
+ int n_fds, i;
+ const int *fds = NULL;
+
+ n_fds = tor_log_get_sigsafe_err_fds();
+ for (i = 0; i < n_fds; ++i) {
+/* tor_log_close_sigsafe_err_fds_on_error() is called on error and on
+ * shutdown, so we can't log or take any useful action if close()
+ * fails. */
+(void)close(fds[i]);
+ }
+
+ /* Don't even try logging, we've closed all the log fds. */
+ tor_log_set_sigsafe_err_fds(NULL, 0);
+}
+
+/**
* Set the granularity (in ms) to use when reporting fatal errors outside
* the logging system.
*/
diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h
index 0badaf7c6..3b86d2039 100644
--- a/src/lib/err/torerr.h
+++ b/src/lib/err/torerr.h
@@ -40,6 +40,7 @@ void tor_log_err_sigsafe(const char *m, ...);
int tor_log_get_sigsafe_err_fds(const int **out);
void tor_log_set_sigsafe_err_fds(const int *fds, int n);
void tor_log_reset_sigsafe_err_fds(void);
+void tor_log_close_sigsafe_err_fds(void);
void tor_log_sigsafe_err_set_granularity(int ms);
int format_hex_number_sigsafe(unsigned long x, char *buf, int max_len);
diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c
index 3ab1b3c4e..a14c46f94 100644
--- a/src/lib/err/torerr_sys.c
+++ b/src/lib/err/torerr_sys.c
@@ -27,8 +27,11 @@ subsys_torerr_initialize(void)
static void
subsys_torerr_shutdown(void)
{
- tor_log_reset_sigsafe_err_fds();
+ /* Stop handling signals with backtraces, then close the logs. */
clean_up_backtrace_handler();
+ /* We can't log any log messages after this point: we've closed all the log
+ * fds, including stdio. */
+ tor_log_close_sigsafe_err_fds();
}
const subsys_fns_t sys_torerr = {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] log: Don't close file log fds that are being used by the err module
commit a22fbab98690f802ae3bda276078cc7fc767feba
Author: teor
Date: Wed Sep 4 15:38:58 2019 +1000
log: Don't close file log fds that are being used by the err module
Instead, dup() file log fds, before passing them to the err module.
Closes 31613, part of 31594.
---
src/lib/err/torerr.c | 6 ++
src/lib/log/log.c| 43 ++-
2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index 2c4a10a5b..f460fd837 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -111,6 +111,12 @@ tor_log_get_sigsafe_err_fds(const int **out)
* other emergency condition. Ignore any beyond the first
* TOR_SIGSAFE_LOG_MAX_FDS.
*
+ * These fds must remain open even after the log module has shut down. (And
+ * they should remain open even while logs are being reconfigured.) Therefore,
+ * any fds closed by the log module should be dup()ed, and the duplicate fd
+ * should be given to the err module in fds. In particular, the log module
+ * closes the file log fds, but does not close the stdio log fds.
+ *
* If fds is NULL or n is 0, clears the list of error fds.
*/
void
diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index d21d8d1d4..2214d4b59 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -664,13 +664,24 @@ tor_log_update_sigsafe_err_fds(void)
const logfile_t *lf;
int found_real_stderr = 0;
- int fds[TOR_SIGSAFE_LOG_MAX_FDS];
+ /* log_fds and err_fds contain matching entries: log_fds are the fds used by
+ * the log module, and err_fds are the fds used by the err module.
+ * For stdio logs, the log_fd and err_fd values are identical,
+ * and the err module closes the fd on shutdown.
+ * For file logs, the err_fd is a dup() of the log_fd,
+ * and the log and err modules both close their respective fds on shutdown.
+ * (Once all fds representing a file are closed, the underlying file is
+ * closed.)
+ */
+ int log_fds[TOR_SIGSAFE_LOG_MAX_FDS];
+ int err_fds[TOR_SIGSAFE_LOG_MAX_FDS];
int n_fds;
LOCK_LOGS();
/* Reserve the first one for stderr. This is safe because when we daemonize,
- * we dup2 /dev/null to stderr, */
- fds[0] = STDERR_FILENO;
+ * we dup2 /dev/null to stderr.
+ * For stderr, log_fds and err_fds are the same. */
+ log_fds[0] = err_fds[0] = STDERR_FILENO;
n_fds = 1;
for (lf = logfiles; lf; lf = lf->next) {
@@ -684,25 +695,39 @@ tor_log_update_sigsafe_err_fds(void)
(LD_BUG|LD_GENERAL)) {
if (lf->fd == STDERR_FILENO)
found_real_stderr = 1;
- /* Avoid duplicates */
- if (int_array_contains(fds, n_fds, lf->fd))
+ /* Avoid duplicates by checking the log module fd against log_fds */
+ if (int_array_contains(log_fds, n_fds, lf->fd))
continue;
- fds[n_fds++] = lf->fd;
+ /* Update log_fds using the log module's fd */
+ log_fds[n_fds] = lf->fd;
+ if (lf->needs_close) {
+/* File log fds are duplicated, because close_log() closes the log
+ * module's fd, and tor_log_close_sigsafe_err_fds() closes the err
+ * module's fd. Both refer to the same file. */
+err_fds[n_fds] = dup(lf->fd);
+ } else {
+/* stdio log fds are not closed by the log module.
+ * tor_log_close_sigsafe_err_fds() closes stdio logs. */
+err_fds[n_fds] = lf->fd;
+ }
+ n_fds++;
if (n_fds == TOR_SIGSAFE_LOG_MAX_FDS)
break;
}
}
if (!found_real_stderr &&
- int_array_contains(fds, n_fds, STDOUT_FILENO)) {
+ int_array_contains(log_fds, n_fds, STDOUT_FILENO)) {
/* Don't use a virtual stderr when we're also logging to stdout. */
raw_assert(n_fds >= 2); /* Don't tor_assert inside log fns */
-fds[0] = fds[--n_fds];
+--n_fds;
+log_fds[0] = log_fds[n_fds];
+err_fds[0] = err_fds[n_fds];
}
UNLOCK_LOGS();
- tor_log_set_sigsafe_err_fds(fds, n_fds);
+ tor_log_set_sigsafe_err_fds(err_fds, n_fds);
}
/** Add to out a copy of every currently configured log file name. Used
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] log: Close log and err file descriptors before aborting
commit 1609916c79612b5cc3a9b363a22f1a9035f2f77b
Author: teor
Date: Wed Sep 4 17:16:49 2019 +1000
log: Close log and err file descriptors before aborting
Part of 31594.
---
src/lib/err/backtrace.c | 2 +-
src/lib/err/torerr.c| 16 ++--
src/lib/err/torerr.h| 6 --
src/lib/log/log.c | 42 --
src/lib/log/log.h | 1 +
src/lib/log/util_bug.c | 11 +++
src/trunnel/trunnel-local.h | 1 +
7 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index 1d1b3bcfa..643fe862b 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -172,7 +172,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_)
for (i=0; i < n_fds; ++i)
backtrace_symbols_fd(cb_buf, (int)depth, fds[i]);
- abort();
+ tor_raw_abort_();
}
/** Write a backtrace to all of the emergency-error fds. */
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index f460fd837..21b28a5f6 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -208,6 +208,18 @@ tor_raw_assertion_failed_msg_(const char *file, int line,
const char *expr,
dump_stack_symbols_to_error_fds();
}
+/**
+ * Call the abort() function to kill the current process with a fatal
+ * error. But first, close the raw error file descriptors, so error messages
+ * are written before process termination.
+ **/
+void
+tor_raw_abort_(void)
+{
+ tor_log_close_sigsafe_err_fds();
+ abort();
+}
+
/* As format_{hex,dex}_number_sigsafe, but takes a radix argument
* in range 2..16 inclusive. */
static int
@@ -242,7 +254,7 @@ format_number_sigsafe(unsigned long x, char *buf, int
buf_len,
unsigned digit = (unsigned) (x % radix);
if (cp <= buf) {
/* Not tor_assert(); see above. */
- abort();
+ tor_raw_abort_();
}
--cp;
*cp = "0123456789ABCDEF"[digit];
@@ -251,7 +263,7 @@ format_number_sigsafe(unsigned long x, char *buf, int
buf_len,
/* NOT tor_assert; see above. */
if (cp != buf) {
-abort(); // LCOV_EXCL_LINE
+tor_raw_abort_(); // LCOV_EXCL_LINE
}
return len;
diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h
index 3b86d2039..a41109527 100644
--- a/src/lib/err/torerr.h
+++ b/src/lib/err/torerr.h
@@ -20,13 +20,13 @@
#define raw_assert(expr) STMT_BEGIN \
if (!(expr)) { \
tor_raw_assertion_failed_msg_(__FILE__, __LINE__, #expr, NULL); \
- abort(); \
+ tor_raw_abort_(); \
} \
STMT_END
#define raw_assert_unreached(expr) raw_assert(0)
#define raw_assert_unreached_msg(msg) STMT_BEGIN\
tor_raw_assertion_failed_msg_(__FILE__, __LINE__, "0", (msg)); \
-abort();\
+tor_raw_abort_(); \
STMT_END
void tor_raw_assertion_failed_msg_(const char *file, int line,
@@ -43,6 +43,8 @@ void tor_log_reset_sigsafe_err_fds(void);
void tor_log_close_sigsafe_err_fds(void);
void tor_log_sigsafe_err_set_granularity(int ms);
+void tor_raw_abort_(void) ATTR_NORETURN;
+
int format_hex_number_sigsafe(unsigned long x, char *buf, int max_len);
int format_dec_number_sigsafe(unsigned long x, char *buf, int max_len);
diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index 2214d4b59..4adcc5cf5 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -224,6 +224,7 @@ int log_global_min_severity_ = LOG_NOTICE;
static void delete_log(logfile_t *victim);
static void close_log(logfile_t *victim);
+static void close_log_sigsafe(logfile_t *victim);
static char *domain_to_string(log_domain_mask_t domain,
char *buf, size_t buflen);
@@ -833,6 +834,30 @@ logs_free_all(void)
* that happened between here and the end of execution. */
}
+/** Close signal-safe log files.
+ * Closing the log files makes the process and OS flush log buffers.
+ *
+ * This function is safe to call from a signal handler. It should only be
+ * called when shutting down the log or err modules. It is currenly called
+ * by the err module, when terminating the process on an abnormal condition.
+ */
+void
+logs_close_sigsafe(void)
+{
+ logfile_t *victim, *next;
+ /* We can't LOCK_LOGS() in a signal handler, because it may call
+ * signal-unsafe functions. And we can't deallocate memory, either. */
+ next = logfiles;
+ logfiles = NULL;
+ while (next) {
+victim = next;
+next = next->next;
+if (victim->needs_close) {
+ close_log_sigsafe(victim);
+}
+ }
+}
+
/** Remove and free the log entry victim from the linked-list
* logfiles (it is probably present, but it might not be due
[tor-commits] [tor/master] Workaround for GCC "note" about "variable tracking size limit"
commit c3b1a25d46273a730529f6bfd2ee49cbdac5197a
Author: Nick Mathewson
Date: Thu Sep 5 17:46:42 2019 -0400
Workaround for GCC "note" about "variable tracking size limit"
GCC complains that we are using too many variables here, probably
because of the sheer number of locals used for our tinytest macros.
Eventually we should fix that (see 30968), but this commit just
makes the "note" go away by splitting the test function into two.
---
src/test/test_addr.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 1b53bf273..f99e3be8f 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -1123,9 +1123,8 @@ test_addr_ip6_helpers(void *arg)
TEST_ADDR_LOOKUP_XFAIL(host_port_str, AF_INET6); \
STMT_END
-/** Test tor_addr_parse() and tor_addr_port_parse(). */
static void
-test_addr_parse(void *arg)
+test_addr_parse_canonical(void *arg)
{
int r;
tor_addr_t addr;
@@ -1153,6 +1152,22 @@ test_addr_parse(void *arg)
TEST_ADDR_V6_PARSE_CANONICAL("::", 0);
TEST_ADDR_V6_PARSE_CANONICAL("2::", 0);
TEST_ADDR_V6_PARSE_CANONICAL("11:22:33:44:55:66:77:88", 0);
+ done:
+ ;
+}
+
+/** Test tor_addr_parse() and tor_addr_port_parse(). */
+static void
+test_addr_parse(void *arg)
+{
+ int r;
+ tor_addr_t addr;
+ uint16_t port;
+ const char *sv;
+ uint32_t addr32h;
+ char buf[TOR_ADDR_BUF_LEN];
+
+ (void)arg;
/* IPv6-mapped IPv4 addresses. Tor doesn't really use these. */
TEST_ADDR_V6_PARSE("11:22:33:44:55:66:1.2.3.4", 0,
@@ -1637,6 +1652,7 @@ struct testcase_t addr_tests[] = {
ADDR_LEGACY(basic),
ADDR_LEGACY(ip6_helpers),
ADDR_LEGACY(parse),
+ ADDR_LEGACY(parse_canonical),
{ "virtaddr", test_virtaddrmap, 0, NULL, NULL },
{ "virtaddr_persist", test_virtaddrmap_persist, TT_FORK, NULL, NULL },
{ "localname", test_addr_localname, 0, NULL, NULL },
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove variable declarations from macros in test_addr_parse()
commit 261ec900dbcac91d8da354d93195bbd70a05b483 Author: Nick Mathewson Date: Thu Sep 5 17:12:17 2019 -0400 Remove variable declarations from macros in test_addr_parse() Instead, put them in the function itself. This is an attempt to fix the gcc warning about the "variable tracking size limit exceeded". --- src/test/test_addr.c | 46 +++--- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 0f50a4361..1b53bf273 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -731,10 +731,6 @@ test_addr_ip6_helpers(void *arg) #define TEST_ADDR_PARSE_FMT(addr_str, expect_family, fmt_decorated, \ expect_str) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -char buf[TOR_ADDR_BUF_LEN]; \ -const char *sv; \ r = tor_addr_parse(, addr_str); \ tt_int_op(r, OP_EQ, expect_family); \ sv = tor_addr_to_str(buf, , sizeof(buf), fmt_decorated); \ @@ -747,8 +743,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_PARSE_XFAIL(addr_str) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ r = tor_addr_parse(, addr_str); \ tt_int_op(r, OP_EQ, -1); \ tt_assert(tor_addr_is_null()); \ @@ -762,11 +756,6 @@ test_addr_ip6_helpers(void *arg) #define TEST_ADDR_PORT_PARSE_FMT(addr_port_str, default_port, expect_family, \ fmt_decorated, expect_str, expect_port) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -uint16_t port; \ -char buf[TOR_ADDR_BUF_LEN]; \ -const char *sv; \ r = tor_addr_port_parse(LOG_DEBUG, addr_port_str, , , \ default_port); \ tt_int_op(r, OP_EQ, 0); \ @@ -783,9 +772,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_PORT_PARSE_XFAIL(addr_port_str, default_port) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -uint16_t port; \ r = tor_addr_port_parse(LOG_DEBUG, addr_port_str, , , \ default_port); \ tt_int_op(r, OP_EQ, -1); \ @@ -799,8 +785,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_V4_LOOKUP_HOSTNAME(addr_str, expect_str) \ STMT_BEGIN \ -int r; \ -uint32_t addr32h; \ r = tor_lookup_hostname(addr_str, ); \ tt_int_op(r, OP_EQ, 0); \ tt_str_op(fmt_addr32(addr32h), OP_EQ, expect_str); \ @@ -812,8 +796,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_V4_LOOKUP_XFAIL(bad_str) \ STMT_BEGIN \ -int r; \ -uint32_t addr32h; \ r = tor_lookup_hostname(bad_str, ); \ tt_int_op(r, OP_EQ, -1); \ tt_int_op(addr32h, OP_EQ, 0); \ @@ -828,8 +810,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_HOST_V4_LOOKUP(host_str) \ STMT_BEGIN \ -int r; \ -uint32_t addr32h; \ r = tor_lookup_hostname(host_str, ); \ tt_int_op(r, OP_GE, -1); \ tt_int_op(r, OP_LE, 1); \ @@ -845,10 +825,6 @@ test_addr_ip6_helpers(void *arg) #define TEST_ADDR_LOOKUP_FMT(addr_str, require_family, expect_family, \ fmt_decorated, expect_str) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -char buf[TOR_ADDR_BUF_LEN]; \ -const char *sv; \ r = tor_addr_lookup(addr_str, require_family, ); \ tt_int_op(r, OP_EQ, 0); \ tt_int_op(tor_addr_family(), OP_EQ, expect_family); \ @@ -863,8 +839,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_LOOKUP_XFAIL(bad_str, require_family) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ r = tor_addr_lookup(bad_str, require_family, ); \ tt_int_op(r, OP_EQ, -1); \ tt_assert(tor_addr_is_null()); \ @@ -879,8 +853,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_HOST_LOOKUP(host_str, require_family) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ r = tor_addr_lookup(host_str, require_family, ); \ tt_int_op(r, OP_GE, -1); \ tt_int_op(r, OP_LE, 1); \ @@ -897,11 +869,6 @@ test_addr_ip6_helpers(void *arg) #define TEST_ADDR_PORT_LOOKUP_FMT(addr_port_str, expect_family, \ fmt_decorated, expect_str, expect_port) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -uint16_t port; \ -char buf[TOR_ADDR_BUF_LEN]; \ -const char *sv; \ r = tor_addr_port_lookup(addr_port_str, , ); \ tt_int_op(r, OP_EQ, 0); \ tt_int_op(tor_addr_family(), OP_EQ, expect_family); \ @@ -918,9 +885,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_ADDR_PORT_LOOKUP_XFAIL(bad_str) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -uint16_t port; \ r = tor_addr_port_lookup(bad_str, , ); \ tt_int_op(r, OP_EQ, -1); \ tt_assert(tor_addr_is_null()); \ @@ -939,9 +903,6 @@ test_addr_ip6_helpers(void *arg) */ #define TEST_HOST_PORT_LOOKUP(host_port_str, expect_success_port) \ STMT_BEGIN \ -int r; \ -tor_addr_t addr; \ -uint16_t port; \ r =
[tor-commits] [tor/master] Merge branch 'tor-github/pr/1299'
commit 3aaa4d416beee81eba3fed1ce9eda17e686fed52 Merge: 87944cecf c3b1a25d4 Author: George Kadianakis Date: Thu Sep 12 18:08:00 2019 +0300 Merge branch 'tor-github/pr/1299' src/test/test_addr.c | 66 1 file changed, 25 insertions(+), 41 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update to breadcrumbs
commit 03fd73a3c602e0bf336678fba18b25b970b1c3de
Author: hiro
Date: Thu Sep 12 17:04:49 2019 +0200
Update to breadcrumbs
---
templates/breadcrumb.html | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index d8518ae..210cb03 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -1,7 +1,11 @@
{% if this.parent %}
- {{
this.parent.title }}
+
+
+ {{ this.parent.title }}
+
+
{% endif %}
{{ this.title
}}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update breadcrubs template
commit 0c596e05d25877bd918f64561200084985a365c7
Author: hiro
Date: Thu Sep 12 17:03:15 2019 +0200
Update breadcrubs template
---
templates/breadcrumb.html | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
index 6f99a4d..d8518ae 100644
--- a/templates/breadcrumb.html
+++ b/templates/breadcrumb.html
@@ -1,13 +1,8 @@
- {% set root = site.get('/') %}
- {% for child in root.children recursive %}
-{{ child.title }}
- {% if this.is_child_of(child) %}
- {{ loop(child.children) }}
- {% endif %}
-
- {% endfor %}
+{% if this.parent %}
+ {{
this.parent.title }}
+{% endif %}
+{{ this.title
}}
___
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 bd166daf8553df06b5ca348c3075b63f61c04184 Author: Translation commit bot Date: Thu Sep 12 14:24:19 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index 6dd76d875..dd9393a57 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -339,7 +339,7 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid " Contact the Tor Project about a Cy Pres Award" -msgstr "" +msgstr " Neem contact op met Tor Project over een Cy-Près prijs" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -466,6 +466,8 @@ msgid "" "By the end of 2003, the network had about a dozen volunteer nodes, mostly in" " the U.S., plus one in Germany." msgstr "" +"Ten einde 2003 had het netwerk ongeveer een dozijn vrijwilligerer-nodes, " +"vooral in de VS en één in Duitsland." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -574,6 +576,8 @@ msgid "" "We are an international team who believes everyone should have private " "access to the uncensored web." msgstr "" +"We zijn een internationaal team welke gelooft dat iedereen private toegang " +"zou moeten hebben tot het ongecensureerde web." #: https//www.torproject.org/about/sponsors/ #: (content/about/sponsors/contents+en.lrsponsors.body) @@ -613,6 +617,8 @@ msgid "" "The biggest news for 3.12 is that we completely changed the installation " "methods for Tails." msgstr "" +"Het grootste nieuws voor versie 3.12 is dat we de installatiemethodes voor " +"Tails volledig hebben herzien." #: https//www.torproject.org/press/-new-release-tor/ #: (content/press/new-release-tor/contents+en.lrpost.title) @@ -733,7 +739,7 @@ msgstr "Bespreek het beschikbaar stellen van een Tor-relay" #: templates/contact.html:14 msgid "Talk with Tor's global south community." -msgstr "" +msgstr "Spreek met Tor's gemeenschap voor ontwikkelingslanden." #: templates/contact.html:20 msgid "Find us on Social Media" @@ -1236,6 +1242,7 @@ msgstr "" #: templates/thank-you.html:17 msgid "Run a relay to make the network faster and more decentralized." msgstr "" +"Voor een relay uit om het netwerk sneller en gedecentraliseerder te maken." #: templates/thank-you.html:21 msgid "Use your skills to volunteer." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Replace tag AUDIT to FISCAL YEAR
commit 68a9326a1b5ab14a38729452c067668c499e0806 Author: gus Date: Thu Sep 12 10:07:06 2019 -0400 Replace tag AUDIT to FISCAL YEAR --- content/about/reports/2009-data-collection/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2009-data-collection/contents.lr b/content/about/reports/2009-data-collection/contents.lr index 080db2f..2a25a2d 100644 --- a/content/about/reports/2009-data-collection/contents.lr +++ b/content/about/reports/2009-data-collection/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2009 --- -tags: AUDIT +tags: FISCAL YEAR --- title: 2009 Dept of Commerce Data Collection Form --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add tag IRS 990 in 2010 IRS Form 990, see #29945
commit 645e2fea04db114b0eb760e069a4dc48116926d3 Author: gus Date: Thu Sep 12 10:04:48 2019 -0400 Add tag IRS 990 in 2010 IRS Form 990, see #29945 --- content/about/reports/2010-irs-form-990/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2010-irs-form-990/contents.lr b/content/about/reports/2010-irs-form-990/contents.lr index c8eac6b..6314ff1 100644 --- a/content/about/reports/2010-irs-form-990/contents.lr +++ b/content/about/reports/2010-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2010 --- -tags: AUDIT +tags: AUDIT, IRS 990 --- title: 2010 IRS Form 990, State of MA Form PC, and Independent Audit Results --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Replace tag FISCAL YEAR to AUDIT. See #29945
commit 0d59eb9d40d91e05ef060f802861153b0221361e Author: gus Date: Thu Sep 12 09:58:24 2019 -0400 Replace tag FISCAL YEAR to AUDIT. See #29945 --- content/about/reports/2011-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index 7d5b541..3eda11d 100644 --- a/content/about/reports/2011-form-pc/contents.lr +++ b/content/about/reports/2011-form-pc/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2011 --- -tags: FISCAL YEAR +tags: AUDIT --- title: 2011 State of MA Form PC --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
commit 6e7ac5a90876632cab44aa19a9209659125fd3e0 Author: Translation commit bot Date: Thu Sep 12 13:52:40 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed --- ja/torbutton.properties | 94 - 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/ja/torbutton.properties b/ja/torbutton.properties index daf9abd49..92ed111d8 100644 --- a/ja/torbutton.properties +++ b/ja/torbutton.properties @@ -1,60 +1,60 @@ -torbutton.circuit_display.internet = ã¤ã³ã¿ã¼ããã -torbutton.circuit_display.ip_unknown = ä¸æãªIP -torbutton.circuit_display.onion_site = Onion ãµã¤ã -torbutton.circuit_display.this_browser = ãã®ãã©ã¦ã¶ã¼ -torbutton.circuit_display.relay = ãªã¬ã¼ -torbutton.circuit_display.tor_bridge = ããªã㸠-torbutton.circuit_display.unknown_country = ä¸æãªå½ -torbutton.circuit_display.guard = ã¬ã¼ã -torbutton.circuit_display.guard_note = [ã¬ã¼ã] ãã¼ãã¯å¤æ´ãããªãå ´åãããã¾ãã -torbutton.circuit_display.learn_more = ããã«ç¥ã -torbutton.content_sizer.margin_tooltip = Tor Browser ã¯ã¦ã£ã³ãã¦ã®ãµã¤ãºãå¹³å¡ã«ããããã«ãã®ãã¼ã¸ã³ã追å ãã¾ããããã«ãããããªãã®ãã¨ããªã³ã©ã¤ã³ã§è¿½è·¡ãã«ãããã¾ãã -torbutton.panel.tooltip.disabled = ã¯ãªãã¯ãã¦Torãæå¹ã«ãã -torbutton.panel.tooltip.enabled = ã¯ãªãã¯ãã¦Torãç¡å¹ã«ãã -torbutton.panel.label.disabled = Tor ç¡å¹ -torbutton.panel.label.enabled = Tor æå¹ -extensions.torbut...@torproject.org.description = Torbuttonã¯Torã®è¨å®ãæ§æããç´ æ©ããã¤å®¹æã«ãã©ã¤ãã¼ããªé²è¦§ãã¼ã¿ãã¯ãªã¢ãããã¿ã³ãæä¾ãã¾ãã -torbutton.popup.external.title = å¤é¨ãã¡ã¤ã«ç¨®å¥ããã¦ã³ãã¼ããã¾ãã -torbutton.popup.external.app = Tor Browser ã¯ãã®ãã¡ã¤ã«ã表示ã§ãã¾ãããå¥ã®ã¢ããªã±ã¼ã·ã§ã³ã§éãå¿ è¦ãããã¾ãã\n -torbutton.popup.external.note = ãã¡ã¤ã«ã®ã¿ã¤ãã®ä¸ã«ãã¢ããªã±ã¼ã·ã§ã³ã Tor ã使ç¨ããã¤ã³ã¿ã¼ãããã«æ¥ç¶ããåå ã¨ãªãå¯è½æ§ããããã®ãããã¾ãã\n -torbutton.popup.external.suggest = å®å ¨ã§ããããã«ã¯ããªãã©ã¤ã³ã®æã®ã¿ãã¦ã³ãã¼ããããã¡ã¤ã«ãéããã Tails ã®ãã㪠Tor ã®ã©ã¤ã CD ã使ç¨ãã¹ãã§ãã\n -torbutton.popup.launch = ãã¡ã¤ã«ããã¦ã³ãã¼ããã -torbutton.popup.cancel = ãã£ã³ã»ã« -torbutton.popup.dontask = ä»ãããã¡ã¤ã«ãèªåçã«ãã¦ã³ãã¼ããã -torbutton.popup.no_newnym = Tor ã³ã³ããã¼ã«ãã¼ãã«ã¢ã¯ã»ã¹ã§ãã¾ããã§ããã Torbutton ã¯æ°ããæ¥ç¶çµè·¯ãå®å ¨ã«ç¨æãããã¨ãã§ãã¾ããã\n\nTor Browser ãã³ãã«ãèµ·åãã¦ãã¾ããï¼ -torbutton.security_settings.menu.title = ã»ãã¥ãªãã£è¨å® -torbutton.title.prompt_torbrowser = éè¦ãªTorbuttonã®æ å ± -torbutton.popup.prompt_torbrowser = Torbuttonã¯ç¾å¨å¥æ§ã«åä½ãã¦ãã¾ããããæ¢ãããã¨ã¯ã§ãã¾ããã\n\nç§ãã¡ã¯ãéTorãã©ã¦ã¸ã³ã°ã®ããã«ã使ããã¦ãããã©ã¦ã¶ã§ã®Torbuttonã®ä½¿ç¨ãå®å ¨ã§ã¯ãªãããããã®å¤æ´ãè¡ãã¾ããã ä»ã®æ¹æ³ã§ä¿®æ£ãããã¨ãã§ããªããã°ãå¤ããã¾ããã\n\næ£å¸¸ã«Firefoxã使ç¨ãããå ´åã¯ãTorbuttonãã¢ã³ã¤ã³ã¹ãã¼ã«ãã¦ãTor Browser Bundleããã¦ã³ãã¼ããã¹ãã§ãã Tor Browserã®ãã©ã¤ãã·ã¼ç¹æ§ã¯FirefoxãTorbuttonã¨ä½¿ããã¦ããæã§ããé常ã®Firefoxã®ãããããåªå¢ã§ãã\n\nTorbuttonãåé¤ããã«ã¯ããã¼ã«->ã¢ããªã³->ã¨ã¯ã¹ãã³ã·ã§ã³ã«è¡ããããããTorbuttonã®é£ã®åé¤ãã¿ã³ãã¯ãªãã¯ãã¦ãã ããã -torbutton.popup.short_torbrowser = éè¦ãªTorbuttonã®æ å ±!\n\nTorbuttonã¯ç¾å¨å¸¸ã«æå¹ã§ãã\n\n詳細ã¯Torbuttonãã¯ãªãã¯ãã¦ãã ããã +# torbutton.circuit_display.internet = Internet +# torbutton.circuit_display.ip_unknown = IP unknown +# torbutton.circuit_display.onion_site = Onion site +# torbutton.circuit_display.this_browser = This browser +# torbutton.circuit_display.relay = Relay +# torbutton.circuit_display.tor_bridge = Bridge +# torbutton.circuit_display.unknown_country = Unknown country +# torbutton.circuit_display.guard = Guard +# torbutton.circuit_display.guard_note = Your [Guard] node may not change. +# torbutton.circuit_display.learn_more = Learn more +# torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +# torbutton.panel.tooltip.disabled = Click to enable Tor +# torbutton.panel.tooltip.enabled = Click to disable Tor +# torbutton.panel.label.disabled =
[tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
commit 3f9a28ca3e0fe94a45b8d928c6855629028654c5 Author: Translation commit bot Date: Thu Sep 12 13:52:33 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties --- ja/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/torbutton.properties b/ja/torbutton.properties index daf9abd49..b30ecc3c2 100644 --- a/ja/torbutton.properties +++ b/ja/torbutton.properties @@ -56,5 +56,5 @@ profileMigrationFailed=åå¨ãã¦ãããããã¡ã¤ã« %S ã¸ã®ãã¤ã° updateDownloadingPanelUILabel=%S æ´æ°ããã¦ã³ãã¼ããã¦ãã¾ã # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=æ¥ç¶ã¯æå·åãããï¼ãªããªã³ãµã¼ãã¹ã%1$S, %2$S ããããã¼ã %3$Sï¼ -pageInfo_OnionEncryption=æ¥ç¶ã¯æå·åãããï¼ãªããªã³ãµã¼ãã¹ï¼ +pageInfo_OnionEncryptionWithBitsAndProtocol=æ¥ç¶ãæå·åããã¦ãã¾ã (Onionãµã¼ãã¹ã%1$Sãéµé· %2$S bitã%3$S) +pageInfo_OnionEncryption=æ¥ç¶ãæå·åããã¦ãã¾ã (Onionãµã¼ãã¹) ___ 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 4a3c508db832f62299cbeb1172a59040d4d6c190 Author: Translation commit bot Date: Thu Sep 12 13:48:55 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sw.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw.po b/sw.po index ccd2143c7..46d7d24bf 100644 --- a/sw.po +++ b/sw.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-09-12 11:25+\n" +"PO-Revision-Date: 2019-09-12 13:37+\n" "Last-Translator: Louis Lloyd \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\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 96a4aa5feb37999e9144009a1160b75a5fce0130 Author: Translation commit bot Date: Thu Sep 12 13:47:38 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sw.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw.po b/sw.po index 74689ab0b..5b0c1956c 100644 --- a/sw.po +++ b/sw.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-09-12 11:25+\n" +"PO-Revision-Date: 2019-09-12 13:37+\n" "Last-Translator: Louis Lloyd \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -708,7 +708,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149 msgid "Password" -msgstr "" +msgstr "Nywila\nnenosiri" #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Replace tag in 2012 Financial Statements to AUDIT #29945
commit 40d61e38334f050382cafbc9367e66d063e5389e Merge: 99128fc 3f8d1d5 Author: gus Date: Thu Sep 12 09:43:45 2019 -0400 Replace tag in 2012 Financial Statements to AUDIT #29945 content/about/reports/2012-financial-statements/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Add .github/FUNDING.yml
commit ccf4f8e82e9a7b13b86a4ddbe2aba595a1186e05 Author: hiro Date: Thu Sep 12 15:45:52 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] #29945 - Replace tag to AUDIT
commit 3f8d1d53b11a7aef8489ad6eb77cda23f6c5dd81 Author: Gustavo Gus Date: Thu Sep 12 13:29:06 2019 + #29945 - Replace tag to AUDIT --- content/about/reports/2012-financial-statements/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2012-financial-statements/contents.lr b/content/about/reports/2012-financial-statements/contents.lr index 602957b..a04ab21 100644 --- a/content/about/reports/2012-financial-statements/contents.lr +++ b/content/about/reports/2012-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2012 --- -tags: FISCAL YEAR +tags: AUDIT --- title: 2012 Financial Statements --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor-web/master] Add .github/FUNDING.yml
commit 2a01c0a1a0e600570fa35add5096c8a763b624c0 Author: hiro Date: Thu Sep 12 15:42:23 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor/master] Add .github/FUNDING.yml
commit ece5dfe58f2c2fbdb810e6a603efeddca135cd23 Author: hiro Date: Thu Sep 12 15:41:59 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [styleguide/master] Add .github/FUNDING.yml
commit b75855b9ccc686a76f09e2ed43b3c23be9bba01a Author: hiro Date: Thu Sep 12 15:41:26 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Add .github/FUNDING.yml
commit 129cb7e830104d0638efd535179f9d5059ef2fcd Author: hiro Date: Thu Sep 12 15:40:18 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Add .github/FUNDING.yml
commit c359a4758b28cfa205e817fdf2745f802a84b65f Author: hiro Date: Thu Sep 12 15:39:26 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor/master] Add .github/FUNDING.yml
commit 427e0eb78af51f76fadb76246abea72184d90f33 Author: hiro Date: Thu Sep 12 15:33:46 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add .github/FUNDING.yml
commit 99128fc2936a20c28ee2f0dbe589cd3a7863034c Author: hiro Date: Thu Sep 12 15:34:31 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org'] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
commit 46b875891aa12a80ed1360d493aeec6645ba8219 Author: Translation commit bot Date: Thu Sep 12 13:23:45 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties --- ja/securitylevel.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/securitylevel.properties b/ja/securitylevel.properties index 292dbea82..25a1886a8 100644 --- a/ja/securitylevel.properties +++ b/ja/securitylevel.properties @@ -1,11 +1,11 @@ securityLevel.securityLevel = ã»ãã¥ãªãã£ã¬ãã« securityLevel.customWarning = ã«ã¹ã¿ã -securityLevel.overview = ã»ãã¥ãªãã£ã¨å¿åæ§ãæ»æããããã«å©ç¨ãããããã¦ã§ãæ©è½ãç¡å¹ã«ããã +securityLevel.overview = ã»ãã¥ãªãã£ã¨å¿åæ§ãæ»æããããã«å©ç¨ãããå¯è½æ§ã®ããã¦ã§ãæ©è½ãç¡å¹åãã¾ãã securityLevel.standard.level = æ¨æº securityLevel.standard.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼æ¨æº securityLevel.standard.summary = Tor Browser ã¨ã¦ã§ããµã¤ãã®ãã¹ã¦ã®æ©è½ãæå¹åããã¾ãã securityLevel.safer.level = ããå®å ¨ -securityLevel.safer.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼ããå®å ¨ +securityLevel.safer.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼ããå®å ¨ securityLevel.safer.summary = ã¦ã§ããµã¤ãã®ãã°ãã°å±éºã§ããæ©è½ãç¡å¹åãã¾ãããµã¤ãã«ãã£ã¦ã¯æ£å¸¸ã«åä½ããªããªãã¾ãã securityLevel.safer.description1 = HTTPSé対å¿ã®ãµã¤ã㧠JavaScript ãç¡å¹åããã¾ãã securityLevel.safer.description2 = ããã¤ãã®ãã©ã³ãã¨æ°å¦è¨å·ãç¡å¹åããã¾ãã @@ -19,4 +19,4 @@ securityLevel.safest.description3 = ãªã¼ãã£ãªã¨ãããª(HTML5ã¡ã㣠securityLevel.custom.summary = ããªãã®ãã©ã¦ã¶ã¼ã«ãããã«ã¹ã¿ã è¨å®ã¯ã»ãã¥ãªãã£çµæã«å½±é¿ãåã¼ãã¾ãããã»ãã¥ãªãã£ã¨ãã©ã¤ãã·ã¼ã«é¢ãã¦ã¯ããã©ã«ãã®ã»ãã¥ãªãã£ã¬ãã«ã®ã²ã¨ã¤ãé¸æãããã¨ããããããããã¾ãã securityLevel.learnMore = ããã«ç¥ã securityLevel.restoreDefaults = ããã©ã«ãã«ãã©ã -securityLevel.advancedSecuritySettings = 詳細ã»ãã¥ãªãã£è¨å®... +securityLevel.advancedSecuritySettings = 詳細ã»ãã¥ãªãã£è¨å®â¦ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-securitylevelproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties_completed
commit 5dad2db0b1e48528bf5c3b62eb009974707f1850 Author: Translation commit bot Date: Thu Sep 12 13:23:52 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties_completed --- ja/securitylevel.properties | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ja/securitylevel.properties b/ja/securitylevel.properties index 292dbea82..f9f963ebe 100644 --- a/ja/securitylevel.properties +++ b/ja/securitylevel.properties @@ -1,22 +1,22 @@ -securityLevel.securityLevel = ã»ãã¥ãªãã£ã¬ãã« -securityLevel.customWarning = ã«ã¹ã¿ã -securityLevel.overview = ã»ãã¥ãªãã£ã¨å¿åæ§ãæ»æããããã«å©ç¨ãããããã¦ã§ãæ©è½ãç¡å¹ã«ããã -securityLevel.standard.level = æ¨æº -securityLevel.standard.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼æ¨æº -securityLevel.standard.summary = Tor Browser ã¨ã¦ã§ããµã¤ãã®ãã¹ã¦ã®æ©è½ãæå¹åããã¾ãã -securityLevel.safer.level = ããå®å ¨ -securityLevel.safer.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼ããå®å ¨ -securityLevel.safer.summary = ã¦ã§ããµã¤ãã®ãã°ãã°å±éºã§ããæ©è½ãç¡å¹åãã¾ãããµã¤ãã«ãã£ã¦ã¯æ£å¸¸ã«åä½ããªããªãã¾ãã -securityLevel.safer.description1 = HTTPSé対å¿ã®ãµã¤ã㧠JavaScript ãç¡å¹åããã¾ãã -securityLevel.safer.description2 = ããã¤ãã®ãã©ã³ãã¨æ°å¦è¨å·ãç¡å¹åããã¾ãã -securityLevel.safer.description3 = ãªã¼ãã£ãªããããª(HTML5ã¡ãã£ã¢)ãWebGLã¯ã¯ãªãã¯ããã¨åçããã¾ãã -securityLevel.safest.level = æãå®å ¨ -securityLevel.safest.tooltip = ã»ãã¥ãªãã£ã¬ãã«ï¼æãå®å ¨ -securityLevel.safest.summary = éçãªãµã¤ãã¨åºæ¬çãªãµã¼ãã¹ã«å¿ è¦ãªæ©è½ã ãã許å¯ãã¾ãããã®å¤æ´ã¯ç»åãã¡ãã£ã¢ãã¹ã¯ãªããã«å½±é¿ãã¾ãã -securityLevel.safest.description1 = ãã¹ã¦ã®ãµã¤ã㧠JavaScript ãç¡å¹åããã¾ãã -securityLevel.safest.description2 = ããã¤ãã®ã¢ã¤ã³ã³ãæ°å¦è¨å·ããã³ç»åãç¡å¹åããã¾ãã -securityLevel.safest.description3 = ãªã¼ãã£ãªã¨ãããª(HTML5ã¡ãã£ã¢)ã¯ã¯ãªãã¯ããã¨åçããã¾ãã -securityLevel.custom.summary = ããªãã®ãã©ã¦ã¶ã¼ã«ãããã«ã¹ã¿ã è¨å®ã¯ã»ãã¥ãªãã£çµæã«å½±é¿ãåã¼ãã¾ãããã»ãã¥ãªãã£ã¨ãã©ã¤ãã·ã¼ã«é¢ãã¦ã¯ããã©ã«ãã®ã»ãã¥ãªãã£ã¬ãã«ã®ã²ã¨ã¤ãé¸æãããã¨ããããããããã¾ãã -securityLevel.learnMore = ããã«ç¥ã -securityLevel.restoreDefaults = ããã©ã«ãã«ãã©ã -securityLevel.advancedSecuritySettings = 詳細ã»ãã¥ãªãã£è¨å®... +# securityLevel.securityLevel = Security Level +# securityLevel.customWarning = Custom +# securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. +# securityLevel.standard.level = Standard +# securityLevel.standard.tooltip = Security Level : Standard +# securityLevel.standard.summary = All Tor Browser and website features are enabled. +# securityLevel.safer.level = Safer +# securityLevel.safer.tooltip = Security Level : Safer +# securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. +# securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. +# securityLevel.safer.description2 = Some fonts and math symbols are disabled. +# securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. +# securityLevel.safest.level = Safest +# securityLevel.safest.tooltip = Security Level : Safest +# securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +# securityLevel.safest.description1 = JavaScript is disabled by default on all sites. +# securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled. +# securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. +# securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. +# securityLevel.learnMore = Learn more +# securityLevel.restoreDefaults = Restore Defaults +# securityLevel.advancedSecuritySettings = Advanced Security Settings⦠___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] #29945 Move Tor Project Bylaws to top under "Founding Documents"
commit 22ff210905d56a0bf2a3729bcd86107f3d969619 Author: Gustavo Gus Date: Thu Sep 12 12:57:52 2019 + #29945 Move Tor Project Bylaws to top under "Founding Documents" --- content/about/reports/2016-12-05-tor-project-bylaws/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr index 2284436..cba936f 100644 --- a/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr +++ b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr @@ -1,12 +1,12 @@ _model: report --- -type: report +type: document --- date: 2016 --- -tags: AUDIT +title: Tor Project Bylaws --- -title: 2016-12-05 Tor Project Bylaws +description: Amended and restated Bylaws for Tor Project, Inc. --- _hidden: yes --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] entrynodes: Make routine descriptor expiry notice logs less alarming
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to expire, as long as tor fetches new ones soon after. Fixes bug 31657; bugfix on 0.3.3.1-alpha. --- changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug31657 b/changes/bug31657 new file mode 100644 index 0..08e9d95fd --- /dev/null +++ b/changes/bug31657 @@ -0,0 +1,5 @@ + o Minor bugfixes (guards): +- When tor is missing descriptors for some primary entry guards, make the + log message less alarming. It's normal for descriptors to expire, as long + as tor fetches new ones soon after. Fixes bug 31657; + bugfix on 0.3.3.1-alpha. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 819f90a6d..1bfb62538 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3765,7 +3765,8 @@ guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, /* otherwise return a helpful error string */ tor_asprintf(_str, "We're missing descriptors for %d/%d of our " - "primary entry guards (total %sdescriptors: %d/%d).", + "primary entry guards (total %sdescriptors: %d/%d). " + "That's ok. We will try to fetch missing descriptors soon.", n_missing_descriptors, num_primary_to_check, using_mds?"micro":"", num_present, num_usable); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 8f0b96004..a486b13ae 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1723,7 +1723,8 @@ test_entry_guard_manage_primary(void *arg) dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3); tt_str_op(dir_info_str, OP_EQ, "We're missing descriptors for 1/2 of our primary entry guards " - "(total microdescriptors: 2/3)."); + "(total microdescriptors: 2/3). That's ok. We will try to fetch " + "missing descriptors soon."); tor_free(dir_info_str); } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1300'
commit 87944cecfc2e313f6514109301f12d1b3bc93f0b Merge: 41261c3b5 670d40262 Author: Nick Mathewson Date: Thu Sep 12 08:50:09 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor/master] Fix update playbook, add upload playbook
commit c0469d37ccfd145c7b598522628aefc56ca23867
Author: hiro
Date: Thu Sep 12 14:18:27 2019 +0200
Fix update playbook, add upload playbook
---
playbooks/upload.yml | 5 +
roles/gettor/tasks/main.yml | 2 +-
roles/uploads/tasks/main.yml | 48
3 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/playbooks/upload.yml b/playbooks/upload.yml
new file mode 100644
index 000..a5c0a84
--- /dev/null
+++ b/playbooks/upload.yml
@@ -0,0 +1,5 @@
+---
+- hosts:
+- gettor
+ roles:
+- uploads
diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml
index 89298f4..767518c 100644
--- a/roles/gettor/tasks/main.yml
+++ b/roles/gettor/tasks/main.yml
@@ -18,7 +18,7 @@
- name: create virtualenv
command: >
-virtualenv {{ gettor_path }}/venv
+virtualenv -p python3 {{ gettor_path }}/venv
args:
chdir: "{{ gettor_path }}"
diff --git a/roles/uploads/tasks/main.yml b/roles/uploads/tasks/main.yml
new file mode 100644
index 000..1a16d43
--- /dev/null
+++ b/roles/uploads/tasks/main.yml
@@ -0,0 +1,48 @@
+---
+- name: check if repository exists
+ stat:
+path: "{{ gettor_path }}/.git/config"
+ register: stat_result
+
+- name: update gettor source
+ git:
+repo: https://git.torproject.org/gettor.git
+version: master
+dest: /srv/gettor.torproject.org/home/gettor/
+clone: no
+update: yes
+
+- name: upload files
+ command: >
+{{ gettor_path }}/scripts/update_files
+
+- name: create virtualenv
+ command: >
+virtualenv -p python3 {{ gettor_path }}/venv
+ args:
+chdir: "{{ gettor_path }}"
+
+- name: activate virtualenv
+ command: . {{ gettor_path }}/venv/bin/activate
+
+- name: export stats
+ command: >
+{{ gettor_path }}/scripts/export_stats
+
+- name: create database
+ command: >
+{{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/scripts/create_db -n
-c -o -f gettor.db
+
+- name: add links
+ command: >
+{{ gettor_path }}/venv/bin/python3 {{ gettor_path
}}/scripts/add_links_to_db -f gettor.db
+
+- name: stop gettor
+ command: >
+./bin gettor_service stop
+ args:
+chdir: "{{ gettor_path }}"
+
+- name: start gettor
+ command: >
+./bin gettor_service start
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor/master] Add .config to .gitignore
commit 92fa80adbfb7b8438a5f8bbdc114a77afd2f7be5 Author: hiro Date: Thu Sep 12 13:55:28 2019 +0200 Add .config to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d6e21ab..f00fa50 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ gettor.db _trial_temp gettor.pid csv +.config ___ 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 92dc31bc5957b30fd4d6ee26bb6338a57262b25f Author: Translation commit bot Date: Thu Sep 12 11:49:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- sw/sw.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index 4e053abb2..bf65b79eb 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -5,6 +5,7 @@ # # Translators: # Zaituni Njovu , 2019 +# Louis Lloyd , 2019 # #, fuzzy msgid "" @@ -13,7 +14,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: Zaituni Njovu , 2019\n" +"Last-Translator: Louis Lloyd , 2019\n" "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -240,7 +241,7 @@ msgstr "" #: ../tailsgreeter/gui.py:397 msgid "Offline" -msgstr "" +msgstr "nje ya mkondo" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." @@ -256,11 +257,11 @@ msgstr "" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "futa" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "Ongeza" #: ../tailsgreeter/gui.py:616 msgid "Back" ___ 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 dc039c735028bc4c44485c96aee90853a9a78082 Author: Translation commit bot Date: Thu Sep 12 11:48:37 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sw.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw.po b/sw.po index bf4e96ba7..ccd2143c7 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+\n" -"Last-Translator: Zaituni Njovu \n" +"PO-Revision-Date: 2019-09-12 11:25+\n" +"Last-Translator: Louis Lloyd \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\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 5962ddede13e63baaefab122c6d8a184cd30fef1 Author: Translation commit bot Date: Thu Sep 12 11:47:26 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sw.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sw.po b/sw.po index bf4e96ba7..74689ab0b 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+\n" -"Last-Translator: Zaituni Njovu \n" +"PO-Revision-Date: 2019-09-12 11:25+\n" +"Last-Translator: Louis Lloyd \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +107,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:398 msgid "Offline" -msgstr "" +msgstr "nje ya mkondo" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:479 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:529 @@ -137,11 +137,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" -msgstr "" +msgstr "futa" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609 msgid "Add" -msgstr "" +msgstr "Ongeza" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617 msgid "Back" @@ -149,7 +149,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731 msgid "Shutdown" -msgstr "" +msgstr "Shutdown" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736 msgid "_Start Tails" @@ -762,7 +762,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" -msgstr "" +msgstr "kosa" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" @@ -782,7 +782,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81 msgid "Learn more" -msgstr "" +msgstr "Kujifunza zaidi" #: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Tor is not ready" @@ -1050,7 +1050,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "" +msgstr "Kivinjari cha Tor" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
commit 93bf9258ea3c6c741ac60a4172fe747226709420 Author: Translation commit bot Date: Thu Sep 12 11:23:16 2019 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sw/sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index c3e1d034c..bf881bd90 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2019-04-29 19:07+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-09-12 11:22+\n" +"Last-Translator: Louis Lloyd \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -215,7 +215,7 @@ msgstr "" #: ../data/whisperback.ui.h:31 msgid "Send" -msgstr "" +msgstr "tuma" #: ../data/whisperback.desktop.in.h:1 msgid "WhisperBack Error Reporting" ___ 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 CollecTor page to include snowflake stats.
commit 412ac16376bb93e9be80b776a64435940f16681d Author: Karsten Loesing Date: Wed Aug 14 10:58:38 2019 +0200 Update CollecTor page to include snowflake stats. Implements #29461. --- src/main/resources/web/jsps/collector.jsp | 24 1 file changed, 24 insertions(+) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index a05b7e0..42280a9 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -196,6 +196,15 @@ recent archive + + Snowflake Statistics + + + Snowflake Statistics + @type snowflake-stats 1.0 + recent + archive + @@ -792,6 +801,21 @@ These are available from a DirPort's + +Snowflake Statistics +# + + +Snowflake Statistics +@type snowflake-stats 1.0 + recent + archive +# + + + +Snowflake statistics containing aggregated information about snowflake proxies and snowflake clients as generated by the snowflake broker. + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Direct users to question about TBA on F-Droid
commit db771d951bc58bdf21deec35b407e30654d6e0b1
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date: Mon Sep 9 10:25:29 2019 -0400
Direct users to question about TBA on F-Droid
will-fix: https://dip.torproject.org/web/tpo/issues/24
---
templates/download-android.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/download-android.html b/templates/download-android.html
index 71eb856..e11a3f5 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -23,7 +23,7 @@
https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{
t.version }}-android-x86-multi.apk.asc">sig
https://play.google.com/store/apps/details?id=org.torproject.torbrowser;>{{
_('Go to Google Play') }}
{% from "macros/downloads.html" import render_fdroid %}
- {{ _('Go to F-droid %s')|format(render_fdroid())|safe }}
+ https://support.torproject.org/tormobile/tormobile-7/;>{{ _('Go to
F-Droid') }}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Merge branch 'fix-24-update-fdroid-link'
commit a6c15f8fed4d76ea2482e401ef7ff141e47b972c Merge: 9e8bd6e db771d9 Author: gus Date: Wed Sep 11 17:16:41 2019 -0400 Merge branch 'fix-24-update-fdroid-link' Fix https://dip.torproject.org/web/tpo/issues/24 templates/download-android.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
commit 97ad8ebbb8bdec933c42d60227202e5d727d7d8a Author: Translation commit bot Date: Thu Sep 12 09:17:19 2019 + https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml --- ml/index.html | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ml/index.html b/ml/index.html index 912f5c8bc..ae30c70c6 100644 --- a/ml/index.html +++ b/ml/index.html @@ -50,28 +50,28 @@ à´¬à´àµâസൠഠറിയിà´àµà´àµà´¨àµà´¨àµ - If you encounter problems with Snowflake as a client or a proxy, - please consider filing a bug. To do so, you will have to, + നിà´àµà´àµ¾ à´¸àµà´¨àµ à´«àµà´³àµà´àµ à´àµ½ à´à´°àµ à´àµà´²à´¯à´¨àµà´±àµ à´à´¯àµ à´ªàµà´°àµà´àµà´¸à´¿ à´à´¯àµ à´à´°àµ à´ªàµà´°àµà´¸à´¨à´ à´¨àµà´°à´¿à´àµà´à´¯à´¾à´£àµà´àµà´à´¿àµ½ , +ദയവായി à´¬à´àµâസൠഠറിയിà´àµà´àµà´ . à´ à´àµà´à´¨àµ à´àµà´¯àµà´¯à´£à´®àµà´àµà´à´¿àµ½, നിà´àµà´àµ¾ à´àµà´¯àµà´¯àµà´£àµà´à´¤àµ -Either https://trac.torproject.org/projects/tor/register;>create an -account or https://trac.torproject.org/projects/tor/login;>log in -using the shared cypherpunks account with password writecode. +à´à´¨àµà´¨àµà´àµà´à´¿àµ½https://trac.torproject.org/projects/tor/register;> à´à´°àµ à´ à´àµà´àµà´£àµà´àµ +നിർമാണഠà´àµà´¯àµà´¯àµà´ à´ à´²àµà´²àµà´àµà´à´¿àµ½ https://trac.torproject.org/projects/tor/login;>à´ªà´àµà´à´¿à´àµà´àµà´àµà´àµà´àµà´¨àµà´¨ +à´¸àµà´«àµ¼ à´ªà´àµà´àµ à´ à´àµà´àµà´£àµà´àµ à´à´ പാസàµà´¸àµâà´µàµàµ¼à´¡àµà´ വറàµà´±àµà´±àµ à´àµà´àµà´ . -https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>File a ticket -using our bug tracker. +https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>à´à´°àµ à´à´¿à´àµà´à´±àµà´±àµ +à´à´ªà´¯àµà´à´¿à´àµà´ à´¬à´àµâസൠബàµà´§à´¿à´ªàµà´ªà´¿à´àµà´àµà´ . -Please try to be as descriptive as possible with your ticket and if - possible include log messages that will help us reproduce the bug. - Consider adding keywords snowflake-webextension or snowflake-client - to let us know how which part of the Snowflake system is experiencing - problems. +ദയവായി നിà´àµà´à´³àµà´àµ à´à´¿à´àµà´à´±àµà´±àµ +à´µàµà´àµà´àµ വളരൠഠധിà´à´ വിശദàµà´à´°à´¿à´àµà´à´¾àµ» പറàµà´±àµà´®àµà´àµà´à´¿àµ½ വിശദàµà´à´°à´¿à´àµà´àµà´ à´àµà´à´¾à´¤àµ പറàµà´±àµà´®àµà´àµà´à´¿àµ½ à´²àµà´àµ സനàµà´¦àµà´¶à´àµà´à´³àµà´ à´àµà´àµà´à´¤àµà´¤à´¿àµ½ à´àµàµ¼à´àµà´àµà´ ഠതൠà´à´àµà´à´³àµà´àµ à´¬à´àµâസൠ+à´ªàµà´¨à´°àµà´¨à´¿à´°àµà´®à´¾à´£à´¤àµà´¤à´¿à´¨àµ സഹായിà´àµà´àµà´ . സനൠഫàµâà´³àµà´àµ à´¨àµà´±àµ à´à´¤àµ à´à´¾à´à´¤àµà´¤à´¾à´£àµ à´ªàµà´°àµà´¸à´¨à´ +à´à´¨àµà´¨àµ à´à´àµà´à´³àµ ഠറിയിà´àµà´àµà´®àµà´ªàµàµ¾ സനൠഫàµâà´³àµà´àµ à´µàµà´¬àµ à´à´àµà´¸àµà´±àµà´±àµ»à´·àµ» à´ à´²àµà´²àµà´àµà´à´¿àµ½ സനൠഫàµâà´³àµà´àµ à´àµà´²à´¯à´¨àµà´±àµ +വാà´àµà´¯à´àµà´àµ¾ à´àµà´àµà´à´¿à´àµà´àµàµ¼à´àµà´àµà´¨àµà´¨à´¤à´¿à´¨àµà´ªàµà´ªà´±àµà´±à´¿ à´à´²àµà´à´¿à´àµà´àµà´ . - EMBED + à´à´à´¬àµà´¡àµ - It is now possible to embed the Snowflake badge on any website: + à´à´ªàµà´ªàµàµ¾ സനൠഫàµâà´³àµà´àµ à´¨àµà´±àµ തിലà´à´ à´à´¤àµ à´µàµà´¬àµà´¸àµà´±àµà´±àµ à´²àµà´ à´à´à´¬àµà´¡àµ à´àµà´¯àµà´¯à´¾àµ» സാദàµà´§àµà´¯à´®à´¾à´£àµ : - iframe src="https://snowflake.torproject.org/embed.html; width="320px" height="200px" frameborder="0" scrolling="no"/iframeWhich looks like this: + iframe src="https://snowflake.torproject.org/embed.html; width="320px" height="200px" frameborder="0" scrolling="no"/iframeഠതൠà´à´àµà´à´¨àµ à´à´¾à´£à´¾àµ» സാധിà´àµà´àµà´ : ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 922ceec4256b763078c988280cf22be7d157e311 Author: Translation commit bot Date: Thu Sep 12 09:15:05 2019 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index 339848eb2..cd555fd4b 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -27,6 +27,6 @@ https://www.torproject.org/getinvolved/volunteer.html.en;> - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Bump version to 1.10.0-dev.
commit 16894a4d0096ac76e0ccbba1cd7b593ab1ddab2c Author: Karsten Loesing Date: Thu Sep 12 10:59:05 2019 +0200 Bump version to 1.10.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f4812c4..4bada49 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Archive snowflake statistics.
commit 569bb83ff5e50843079ebd1150801a8bd8efa747
Author: Karsten Loesing
Date: Wed Aug 14 08:51:29 2019 +0200
Archive snowflake statistics.
Implements #29461.
---
CHANGELOG.md | 2 +
build.xml | 2 +-
.../org/torproject/metrics/collector/Main.java | 3 +
.../metrics/collector/conf/Annotation.java | 3 +-
.../metrics/collector/conf/Configuration.java | 1 +
.../org/torproject/metrics/collector/conf/Key.java | 8 +-
.../persist/SnowflakeStatsPersistence.java | 37
.../snowflake/SnowflakeStatsDownloader.java| 191 +
.../metrics/collector/sync/SyncPersistence.java| 5 +
src/main/resources/collector.properties| 20 +++
src/main/resources/create-tarballs.sh | 7 +
src/main/resources/docs/PROTOCOL | 33 +++-
.../metrics/collector/conf/ConfigurationTest.java | 2 +-
.../metrics/collector/cron/CollecTorMainTest.java | 1 +
.../metrics/collector/cron/SchedulerTest.java | 9 +-
15 files changed, 317 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd0401..c537d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
versions resolved by Ivy are the same as in Debian stretch with
few exceptions.
- Remove Cobertura from the build process.
+ - Archive snowflake statistics.
+ - Update to metrics-lib 2.7.0.
# Changes in version 1.9.1 - 2019-05-29
diff --git a/build.xml b/build.xml
index 39180c7..d1d5b70 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/src/main/java/org/torproject/metrics/collector/Main.java
b/src/main/java/org/torproject/metrics/collector/Main.java
index 46e93af..6907e93 100644
--- a/src/main/java/org/torproject/metrics/collector/Main.java
+++ b/src/main/java/org/torproject/metrics/collector/Main.java
@@ -14,6 +14,7 @@ import
org.torproject.metrics.collector.exitlists.ExitListDownloader;
import org.torproject.metrics.collector.indexer.CreateIndexJson;
import org.torproject.metrics.collector.onionperf.OnionPerfDownloader;
import org.torproject.metrics.collector.relaydescs.ArchiveWriter;
+import org.torproject.metrics.collector.snowflake.SnowflakeStatsDownloader;
import org.torproject.metrics.collector.webstats.SanitizeWeblogs;
import org.slf4j.Logger;
@@ -53,6 +54,8 @@ public class Main {
collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class);
collecTorMains.put(Key.OnionPerfActivated, OnionPerfDownloader.class);
collecTorMains.put(Key.WebstatsActivated, SanitizeWeblogs.class);
+collecTorMains.put(Key.SnowflakeStatsActivated,
+SnowflakeStatsDownloader.class);
}
private static Configuration conf = new Configuration();
diff --git
a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
index 2e47df0..8cd3324 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
@@ -18,7 +18,8 @@ public enum Annotation {
Server("@type server-descriptor 1.0\n"),
Status("@type bridge-network-status 1.2\n"),
OnionPerf("@type torperf 1.1\n"),
- Vote("@type network-status-vote-3 1.0\n");
+ Vote("@type network-status-vote-3 1.0\n"),
+ SnowflakeStats("@type snowflake-stats 1.0\n");
private final String annotation;
private final byte[] bytes;
diff --git
a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
index 69d3bcd..27f5125 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
@@ -91,6 +91,7 @@ public class Configuration extends Observable implements
Cloneable {
|| this.getBool(Key.ExitlistsActivated)
|| this.getBool(Key.UpdateindexActivated)
|| this.getBool(Key.OnionPerfActivated)
+|| this.getBool(Key.SnowflakeStatsActivated)
|| this.getBool(Key.WebstatsActivated))) {
throw new ConfigurationException("Nothing is activated!\n"
+ "Please edit collector.properties. Exiting.");
diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java
b/src/main/java/org/torproject/metrics/collector/conf/Key.java
index ba4bcd9..e683fe2 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Key.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java
@@ -66,7 +66,13 @@ public enum Key {
WebstatsActivated(Boolean.class),
WebstatsLimits(Boolean.class),
WebstatsOffsetMinutes(Integer.class),
- WebstatsPeriodMinutes(Integer.class);
+ WebstatsPeriodMinutes(Integer.class),
+ SnowflakeStatsActivated(Boolean.class),
+
[tor-commits] [collector/release] Upgrade to latest metrics-base.
commit 02b709b65eb8679020e9af67905640a46c362fec
Author: Karsten Loesing
Date: Wed Jul 24 19:08:55 2019 +0200
Upgrade to latest metrics-base.
Also include change log entries and fix a few Checkstyle complaints.
---
CHANGELOG.md | 16
src/build| 2 +-
.../java/org/torproject/metrics/collector/conf/Key.java | 4 +++-
.../metrics/collector/webstats/SanitizeWeblogs.java | 2 +-
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4682fef..55118c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# Changes in version 1.10.0 - 2019-0?-??
+
+ * Medium changes
+ * Update build-time and run-time dependencies to versions found in
+ Debian buster, including: commons-codec-1.11.jar,
+ commons-compress-1.18.jar, jackson-annotations-2.9.8.jar,
+ jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar,
+ logback-core-1.2.3.jar, logback-classic-1.2.3.jar,
+ slf4j-api-1.7.25.jar, and xz-1.8.jar.
+ * Update Checkstyle dependencies to versions found in Debian
+ buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar,
+ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar,
+ commons-collections3-3.2.2.jar, commons-logging-1.2.jar,
+ guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar.
+
+
# Changes in version 1.9.1 - 2019-05-29
* Medium changes
diff --git a/src/build b/src/build
index e12ba96..42ee1fc 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a
+Subproject commit 42ee1fc086b0e86cddf56475124a547465484321
diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java
b/src/main/java/org/torproject/metrics/collector/conf/Key.java
index ba4bcd9..32e20ce 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Key.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java
@@ -72,7 +72,9 @@ public enum Key {
private static Set keys;
/**
- * @param Class of key value.
+ * Instantiate a new {@code Key} using the given class for the key value.
+ *
+ * @param clazz Class of key value.
*/
Key(Class clazz) {
this.clazz = clazz;
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 027cfde..539194e 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
@@ -166,7 +166,7 @@ public class SanitizeWeblogs extends CollecTorMain {
private static final int BATCH = 100_000;
static byte[] toCompressedBytes(Map lines)
-throws DescriptorParseException {
+ throws DescriptorParseException {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStream os = FileType.XZ.outputStream(baos)) {
for (Map.Entry entry : lines.entrySet()) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Revert all Debian buster library upgrades.
commit 6ad185caeaafa3c67113cb6ea6290e984feda6ee
Author: Karsten Loesing
Date: Sun Jul 28 21:50:09 2019 +0200
Revert all Debian buster library upgrades.
Turns out that updating all dependencies, including those in
metrics-web and exonerator using servlets and JSPs, is much harder
than expected. We decided to revert all these changes for now, so that
we can merge patches again. We're going to investigate alternatives
like Ant + Ivy, Maven, or Gradle in the near future.
---
CHANGELOG.md | 20
build.xml| 18 +-
src/build| 2 +-
.../org/torproject/metrics/collector/conf/Key.java | 4 +---
.../metrics/collector/webstats/SanitizeWeblogs.java | 2 +-
5 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a07711..4682fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,3 @@
-# Changes in version 1.10.0 - 2019-0?-??
-
- * Medium changes
- * Update build-time and run-time dependencies to versions found in
- Debian buster, including: commons-codec-1.11.jar,
- commons-compress-1.18.jar, jackson-annotations-2.9.8.jar,
- jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar,
- logback-core-1.2.3.jar, logback-classic-1.2.3.jar,
- slf4j-api-1.7.25.jar, and xz-1.8.jar.
- * Update Checkstyle dependencies to versions found in Debian
- buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar,
- checkstyle-8.15.jar, commons-beanutils-1.9.3.jar,
- commons-collections3-3.2.2.jar, commons-logging-1.2.jar,
- guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar.
- * Update Cobertura dependencies to versions found in Debian buster,
- including: asm4-5.0.4.jar, asm4-util-5.0.4.jar,
- asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar,
- asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar
-
-
# Changes in version 1.9.1 - 2019-05-29
* Medium changes
diff --git a/build.xml b/build.xml
index d35fd58..d0fd248 100644
--- a/build.xml
+++ b/build.xml
@@ -15,16 +15,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/src/build b/src/build
index 42ee1fc..ed48192 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 42ee1fc086b0e86cddf56475124a547465484321
+Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b
diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java
b/src/main/java/org/torproject/metrics/collector/conf/Key.java
index 32e20ce..ba4bcd9 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Key.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java
@@ -72,9 +72,7 @@ public enum Key {
private static Set keys;
/**
- * Instantiate a new {@code Key} using the given class for the key value.
- *
- * @param clazz Class of key value.
+ * @param Class of key value.
*/
Key(Class clazz) {
this.clazz = clazz;
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 539194e..027cfde 100644
---
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
+++
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
@@ -166,7 +166,7 @@ public class SanitizeWeblogs extends CollecTorMain {
private static final int BATCH = 100_000;
static byte[] toCompressedBytes(Map lines)
- throws DescriptorParseException {
+throws DescriptorParseException {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStream os = FileType.XZ.outputStream(baos)) {
for (Map.Entry entry : lines.entrySet()) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Prepare for 1.10.0 release.
commit 1037677d9ec1c94a26d8dccff454e348d29bd344 Author: Karsten Loesing Date: Thu Sep 12 10:50:31 2019 +0200 Prepare for 1.10.0 release. --- CHANGELOG.md | 2 +- build.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c537d22..b38b124 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.10.0 - 2019-??-?? +# Changes in version 1.10.0 - 2019-09-12 * Medium changes - Changed local import of bandwidth files to include the parent diff --git a/build.xml b/build.xml index d1d5b70..f4812c4 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Also update metrics-lib version for GitLab's CI.
commit d132d40f8b3723e41ce7baf32d624a38d08edeba Author: Karsten Loesing Date: Thu Sep 12 10:20:12 2019 +0200 Also update metrics-lib version for GitLab's CI. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67b5a4..5bd5623 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" + METRICS_LIB_VERSION: "2.7.0" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Add source name to locally imported bandwidth files.
commit abde3f7591117060ccf1afc9b26531d79619301f
Author: Karsten Loesing
Date: Wed Jul 10 10:34:09 2019 +0200
Add source name to locally imported bandwidth files.
Implements #30219.
---
CHANGELOG.md | 7 +++
.../metrics/collector/relaydescs/ArchiveReader.java | 2 +-
.../metrics/collector/relaydescs/ArchiveWriter.java | 12 +---
.../collector/relaydescs/CachedRelayDescriptorReader.java| 6 +++---
.../collector/relaydescs/RelayDescriptorDownloader.java | 4 ++--
.../metrics/collector/relaydescs/RelayDescriptorParser.java | 7 +--
src/main/resources/collector.properties | 5 -
7 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4682fef..613ef71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 1.10.0 - 2019-??-??
+
+ * Medium changes
+ - Changed local import of bandwidth files to include the parent
+ directory name as @source annotation and to the filename.
+
+
# Changes in version 1.9.1 - 2019-05-29
* Medium changes
diff --git
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
index 27010a9..fee46c9 100644
---
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
+++
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
@@ -141,7 +141,7 @@ public class ArchiveReader {
}
bis.close();
byte[] allData = baos.toByteArray();
-boolean stored = this.rdp.parse(allData);
+boolean stored = this.rdp.parse(allData, pop);
if (!stored) {
filesToRetry.add(pop);
continue;
diff --git
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
index e1279ee..911ac2a 100644
---
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
+++
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
@@ -745,18 +745,24 @@ public class ArchiveWriter extends CollecTorMain {
/** Stores a bandwidth file to disk. */
void storeBandwidthFile(byte[] data, LocalDateTime fileCreatedOrTimestamp,
- String bandwidthFileDigest) {
+ String sourceName, String bandwidthFileDigest) {
DateTimeFormatter printFormat = DateTimeFormatter
.ofPattern("/MM/dd/-MM-dd-HH-mm-ss").withZone(ZoneOffset.UTC);
File tarballFile = Paths.get(this.outputDirectory, "bandwidth",
fileCreatedOrTimestamp.format(printFormat) + "-bandwidth-"
++ (null == sourceName ? "" : (sourceName + "-"))
+ bandwidthFileDigest).toFile();
+StringBuilder sb = new StringBuilder();
+sb.append(Annotation.BandwidthFile.toString());
+if (null != sourceName) {
+ sb.append("@source ").append(sourceName).append('\n');
+}
boolean tarballFileExistedBefore = tarballFile.exists();
File rsyncFile = Paths.get(recentPathName, RELAY_DESCRIPTORS, "bandwidths",
tarballFile.getName()).toFile();
File[] outputFiles = new File[] { tarballFile, rsyncFile };
-if (this.store(Annotation.BandwidthFile.bytes(), data, outputFiles, null))
{
- this.storedVotesCounter++;
+if (this.store(sb.toString().getBytes(), data, outputFiles, null)) {
+ this.storedBandwidthsCounter++;
}
if (!tarballFileExistedBefore
&& this.nowLocalDateTime.isAfter(fileCreatedOrTimestamp.plusDays(3L)))
{
diff --git
a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
index 3e1bba4..0308f05 100644
---
a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
+++
b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
@@ -158,7 +158,7 @@ public class CachedRelayDescriptorReader {
allData));
if (!this.lastImportHistory.contains(digest)
&& !this.currentImportHistory.contains(digest)) {
- this.rdp.parse(allData);
+ this.rdp.parse(allData, null);
} else {
this.dumpStats.append(" (skipped)");
}
@@ -183,7 +183,7 @@ public class CachedRelayDescriptorReader {
rawNetworkStatusBytes));
if (!this.lastImportHistory.contains(digest)
&& !this.currentImportHistory.contains(digest)) {
- this.rdp.parse(rawNetworkStatusBytes);
+ this.rdp.parse(rawNetworkStatusBytes, null);
parsedNum++;
} else {
skippedNum++;
@@ -229,7 +229,7
[tor-commits] [collector/release] Use Ivy for resolving external dependencies.
commit 027a54bfe2c970a72db2afc485d2fa12f77cb247 Author: Karsten Loesing Date: Tue Aug 6 17:04:41 2019 +0200 Use Ivy for resolving external dependencies. Includes an upgrade to the latest metrics-base commit 256e619. Implements part of #31326. --- CHANGELOG.md | 9 + build.xml| 3 ++- src/build| 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 613ef71..66e53ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ * Medium changes - Changed local import of bandwidth files to include the parent directory name as @source annotation and to the filename. + - Use Ivy for resolving external dependencies rather than relying + on files found in Debian stable packages. Requires installing Ivy + (using `apt-get install ivy`, `brew install ivy`, or similar) and + running `ant resolve` (or `ant -lib /usr/share/java resolve`). + Retrieved files are then copied to the `lib/` directory, except + for dependencies on other metrics libraries that still need to be + copied to the `lib/` directory manually. Current dependency + versions resolved by Ivy are the same as in Debian stretch with + few exceptions. # Changes in version 1.9.1 - 2019-05-29 diff --git a/build.xml b/build.xml index d0fd248..39180c7 100644 --- a/build.xml +++ b/build.xml @@ -4,7 +4,8 @@ ]> - + diff --git a/src/build b/src/build index ed48192..256e619 16 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b +Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Adds GitLab CI for tests and checks
commit a8a4961a1b49a3104dd37ac93cc41e3f908e25c5 Author: Iain R. Learmonth Date: Thu Sep 5 12:21:43 2019 +0100 Adds GitLab CI for tests and checks Configuration is held in the .gitlab-ci.yml file. Fixes: #31399 --- .gitlab-ci.yml | 25 + 1 file changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000..b67b5a4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +variables: + GIT_STRATEGY: clone + METRICS_LIB_VERSION: "2.6.2" + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + +stages: + - test + +test: + stage: test + image: debian:buster + script: + - apt update + - apt -y install default-jdk ant ivy git curl + - git submodule init + - git submodule update + - mkdir lib + - mkdir tmp + - pushd tmp + - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz | tar xzf - + - popd + - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant -lib /usr/share/java resolve + - ant test + - ant checks ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Remove Cobertura from the build process.
commit 801008431115951fe3b0f967c7d4ca0469610ae8 Author: Karsten Loesing Date: Wed Aug 14 11:38:40 2019 +0200 Remove Cobertura from the build process. --- CHANGELOG.md | 1 + src/build| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e53ed..4fd0401 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ copied to the `lib/` directory manually. Current dependency versions resolved by Ivy are the same as in Debian stretch with few exceptions. + - Remove Cobertura from the build process. # Changes in version 1.9.1 - 2019-05-29 diff --git a/src/build b/src/build index 256e619..75cda35 16 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f +Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Update to Debian buster libraries.
commit e65269dfe70312e50472de807dc0714b0aed5ec1 Author: Karsten Loesing Date: Wed Jul 24 10:43:52 2019 +0200 Update to Debian buster libraries. Also upgrade to latest metrics-base. Checkstyle is excluded from this update. --- build.xml | 18 +- src/build | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index d0fd248..d35fd58 100644 --- a/build.xml +++ b/build.xml @@ -15,16 +15,16 @@ - - - - - - + + + + + + - - - + + + diff --git a/src/build b/src/build index e639c69..e12ba96 16 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit e639c697e9e94c6dbb26e946e5247c20a62c0661 +Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Bump version to 1.9.1-dev.
commit d992d8719d507fa8fffee24faa18546da848e16e Author: Karsten Loesing Date: Thu May 30 15:32:07 2019 +0200 Bump version to 1.9.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index d2d1f73..d0fd248 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/release] Add change log entry for Cobertura deps.
commit 7f36a2b12eb5e25c441e0d8a40c5c9a7de19821c Author: Karsten Loesing Date: Wed Jul 24 19:56:18 2019 +0200 Add change log entry for Cobertura deps. --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55118c2..3a07711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, commons-collections3-3.2.2.jar, commons-logging-1.2.jar, guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + * Update Cobertura dependencies to versions found in Debian buster, + including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, + asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, + asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar # Changes in version 1.9.1 - 2019-05-29 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Prepare for 1.10.0 release.
commit 1037677d9ec1c94a26d8dccff454e348d29bd344 Author: Karsten Loesing Date: Thu Sep 12 10:50:31 2019 +0200 Prepare for 1.10.0 release. --- CHANGELOG.md | 2 +- build.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c537d22..b38b124 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.10.0 - 2019-??-?? +# Changes in version 1.10.0 - 2019-09-12 * Medium changes - Changed local import of bandwidth files to include the parent diff --git a/build.xml b/build.xml index d1d5b70..f4812c4 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
commit 65e80cd7bf1a06117bdeba839f2bd3afe529336f Author: Translation commit bot Date: Thu Sep 12 08:47:25 2019 + https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml --- ml/index.html | 82 +++ 1 file changed, 82 insertions(+) diff --git a/ml/index.html b/ml/index.html new file mode 100644 index 0..912f5c8bc --- /dev/null +++ b/ml/index.html @@ -0,0 +1,82 @@ + + + + + + +à´¸àµâà´¨àµà´«àµà´³àµà´àµ + + + +https://www.torproject.org/;> + + + à´¸àµâà´¨àµà´«àµà´³àµà´àµ + + + + à´¸àµâà´¨àµà´«àµà´³àµà´àµ à´à´¨àµà´¨à´¤àµ à´à´°àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´¸àµà´¨àµà´¸à´°àµà´·à´¿à´ªàµ à´ªàµà´°àµà´§à´¿à´°àµà´§à´¿à´àµà´àµà´¨àµà´¨ സിസàµà´±àµà´±à´®à´¾à´£àµ . à´¸àµà´¨àµà´¸à´°àµà´·à´¿à´ªàµ à´à´³àµà´³ à´¸àµà´¥à´²à´àµà´à´³à´¿à´²àµ à´à´³àµà´àµ¾à´àµà´àµ à´¸àµâà´¨àµà´«àµà´³àµà´àµ à´à´ªà´¯àµà´à´¿à´àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´à´ªà´¯àµà´à´¿à´àµà´à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ . ഠവരàµà´àµ ബനàµà´§à´àµà´àµ¾ à´¸àµâà´¨àµà´«àµà´³àµà´àµ ഠപരനàµà´®à´¾àµ¼ വഴി à´à´¯à´¿à´°à´¿à´àµà´àµà´ +à´ªàµà´àµà´¨àµà´¨à´¤àµ , ഠതൠപàµà´°àµà´µà´°àµà´¤à´¿à´ªàµà´ªà´¿à´àµà´àµà´¨àµà´¨à´¤àµ à´¸àµà´µà´®àµà´§à´¯à´¾ à´ªàµà´°à´µàµ¼à´¤àµà´àµà´àµà´¨àµà´¨ à´à´³àµà´àµ¾ à´®àµà´à´¾à´¨àµà´¦à´°à´®à´¾à´£àµ .à´àµà´àµà´¤àµ½ വിശദമായ വിവരà´àµà´àµ¾à´àµà´àµà´ à´à´àµà´à´¨àµà´¯à´¾à´£àµ സനàµà´«àµà´³àµà´àµ à´ªàµà´°àµà´µà´°àµà´¤à´¿à´àµà´àµà´¨àµà´¨à´¤àµà´¨àµà´¨àµà´ ഠറിയാൻ https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/;>വിà´àµà´à´¿ à´à´£àµà´¡à´ à´à´¾à´£àµà´ + + + + + à´¬àµà´°àµà´¸àµ¼ + + നിà´àµà´à´³àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´à´ªà´¯àµà´à´ à´¸àµàµ»à´¸àµ¼ à´àµà´¯àµà´¤à´¿à´àµà´àµà´£àµà´àµà´àµà´à´¿àµ½ നിà´àµà´àµ¾ à´¤àµàµ¼à´àµà´à´¯à´¾à´¯àµà´ https://www.torproject.org/download/;>à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ à´¡àµàµºà´²àµà´¡àµ à´àµà´¯àµà´¯àµà´ + + + + + + à´µàµà´¯à´¾à´ªà´¿à´ªàµà´ªà´¿à´àµà´à´¾àµ» + + നിà´àµà´à´³àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´à´ªà´¯àµà´à´ à´¸àµàµ»à´¸àµ¼ à´àµà´¯àµà´¤à´¿à´àµà´à´¿à´²àµà´²àµà´àµà´à´¿àµ½ നിà´àµà´àµ¾ à´¤àµàµ¼à´àµà´à´¯à´¾à´¯àµà´ + സനൠഫàµà´³àµà´àµ à´à´àµà´¸àµà´±àµà´±àµ»à´·àµ» à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ à´àµà´¯àµà´¤àµ മറàµà´±àµà´³àµà´³ à´¸àµàµ»à´¸àµ¼ à´àµà´¯àµà´¤àµà´ªàµà´¯à´¿à´àµà´àµà´³àµà´³ +à´à´ªà´àµà´àµà´¤à´¾à´àµà´à´³àµ സഹായിà´àµà´à´£à´. മറàµà´±àµà´³àµà´³ à´à´ªà´àµà´àµà´¤à´¾à´àµà´àµ¾ +à´à´¤àµà´àµà´àµ തരതàµà´¤à´¿àµ½ à´à´³àµà´³ à´µàµà´¬àµà´¸àµà´±àµà´±àµ à´à´£àµ നിà´àµà´à´³àµà´àµ à´ªàµà´°àµà´àµà´¸à´¿ വഴി à´à´ªà´¯àµà´à´¿à´àµà´àµà´¨àµà´¨à´¤àµ à´à´¨àµà´¨à´¤à´¿à´¨àµ പറàµà´±à´¿ നിà´àµà´àµ¾ à´µàµà´¯à´¾à´àµà´²à´ªàµà´ªàµà´àµà´£àµà´à´¤à´¿à´²àµà´² . ഠവരàµà´àµ à´à´¾à´£àµà´¨àµà´¨ ഠപി à´à´ªàµà´ªà´´àµà´ +ഠവരàµà´àµ à´àµàµ¼ à´à´àµà´¸à´¿à´±àµ à´¨àµà´àµ à´à´¯à´¿à´°à´¿à´¯àµà´àµà´àµà´, നിà´àµà´à´³àµà´àµ à´à´¯à´¿à´°à´¿à´àµà´à´¿à´²àµà´² . + + https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/;> +ഫയർഫàµà´àµà´¸àµ à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ à´àµà´¯àµà´¯àµà´ + +https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie;> +à´àµà´°àµà´ à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ à´àµà´¯àµà´¯àµà´ + + + + + + + à´¬à´àµâസൠഠറിയിà´àµà´àµà´¨àµà´¨àµ + + If you encounter problems with Snowflake as a client or a proxy, + please consider filing a bug. To do so, you will have to, + + +Either https://trac.torproject.org/projects/tor/register;>create an +account or https://trac.torproject.org/projects/tor/login;>log in +using the shared cypherpunks account with password writecode. + +https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>File a ticket +using our bug tracker. + +Please try to be as descriptive as possible with your ticket and if + possible include log messages that will help us reproduce the bug. + Consider adding keywords snowflake-webextension or snowflake-client + to let us know how which part of the Snowflake system is experiencing + problems. + + EMBED + + It is now possible to embed the Snowflake badge on any website: + + iframe src="https://snowflake.torproject.org/embed.html; width="320px" height="200px" frameborder="0" scrolling="no"/iframeWhich looks like this:
[tor-commits] [translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
commit e519e2895a585cb0feff9db19ae01fa5ba60a8dd Author: Translation commit bot Date: Thu Sep 12 08:46:54 2019 + https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- ml/strings.xml | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ml/strings.xml b/ml/strings.xml index cb5acbb4f..2f96b4756 100644 --- a/ml/strings.xml +++ b/ml/strings.xml @@ -1,2 +1,10 @@ - +à´à´°àµà´«àµà´àµà´¸àµ à´àµ¼ ഠപി +à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ à´¶àµà´°àµà´®à´¿à´àµà´àµà´ +à´à´°àµà´«àµà´àµà´¸àµ à´à´ªàµà´ªàµàµ¾ à´àµ»à´¡àµà´°àµà´¯à´¿à´¡àµ നൠവàµà´£àµà´à´¿à´¯àµà´³àµà´³ à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ à´à´£àµ +നിà´àµà´àµ¾ à´ªàµà´°àµà´¤à´¿à´ªà´¾à´¦à´¿à´àµà´àµà´¨àµà´¨ à´à´±à´µà´¿à´à´¤àµà´¤à´¿àµ½ നിനàµà´¨àµà´ à´²à´àµà´¯à´®à´¾à´àµà´àµà´ +à´à´«àµ à´¡àµà´°àµà´¯à´¿à´¡à´¿à´²àµà´àµ à´ªàµà´àµà´ +à´àµà´à´¿àµ¾ à´ªàµà´¯à´¿à´²àµà´àµ à´ªàµà´àµà´ +ഠപി à´àµ à´¡àµàµºà´²àµà´¡àµ à´àµà´¯àµà´¯àµà´ +തിരà´àµà´àµ à´µàµà´àµà´à´¤àµ à´à´¯à´±àµà´±àµà´®à´¤à´¿ à´àµà´¯àµà´¯àµà´ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Translations update
commit e0e77b8066e782d919d7a6b752590b419d6e552d Author: Georg Koppen Date: Thu Sep 12 08:25:23 2019 + Translations update --- chrome/locale/it/aboutTBUpdate.dtd | 2 +- chrome/locale/nl/aboutTBUpdate.dtd | 4 ++-- chrome/locale/nl/aboutTor.dtd | 6 +++--- chrome/locale/nl/torbutton.dtd | 4 ++-- chrome/locale/zh-TW/torbutton.dtd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/locale/it/aboutTBUpdate.dtd b/chrome/locale/it/aboutTBUpdate.dtd index e40ec576..d179811b 100644 --- a/chrome/locale/it/aboutTBUpdate.dtd +++ b/chrome/locale/it/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ - + diff --git a/chrome/locale/nl/aboutTBUpdate.dtd b/chrome/locale/nl/aboutTBUpdate.dtd index 56f0e81d..6d078b5d 100644 --- a/chrome/locale/nl/aboutTBUpdate.dtd +++ b/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ - + - + diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index b4ac52c4..68f4c848 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -6,7 +6,7 @@ - + @@ -19,10 +19,10 @@ - + - + https://www.torproject.org/getinvolved/volunteer.html.en;> diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index 7125d44f..a49811bb 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -26,10 +26,10 @@ - + - + diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 7868343e..2839961a 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -34,8 +34,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
commit 3e2f75ecd6e66edde267d561097a4a0c0a8dd1dd Author: Translation commit bot Date: Thu Sep 12 08:22:36 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- ml/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml/torcheck.po b/ml/torcheck.po index 4ebd1b463..e4f291396 100644 --- a/ml/torcheck.po +++ b/ml/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-09-12 07:52+\n" +"PO-Revision-Date: 2019-09-12 07:53+\n" "Last-Translator: ameer pb \n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" @@ -87,7 +87,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "à´à´¨àµà´¨à´¿à´°àµà´¨àµà´¨à´¾à´²àµà´ à´à´¤àµ à´àµàµ¼ à´¬àµà´°àµà´¸à´±à´¿àµ½ à´à´¾à´£àµà´¨àµà´¨à´¿à´²àµà´² " msgid "Run a Relay" -msgstr "" +msgstr "à´à´°àµ റിലൠà´à´à´¿à´àµà´àµà´ " msgid "Stay Anonymous" msgstr "à´ à´àµà´à´¾à´¤à´¨à´¾à´¯à´¿ à´¤àµà´à´°àµà´ " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
commit 6c94f06a29d7feb1d07136615bb66f706b2cae42 Author: Translation commit bot Date: Thu Sep 12 08:22:24 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties --- ml/securitylevel.properties | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ml/securitylevel.properties b/ml/securitylevel.properties index 18e06f238..17ff8d032 100644 --- a/ml/securitylevel.properties +++ b/ml/securitylevel.properties @@ -1,22 +1,22 @@ securityLevel.securityLevel = à´¸àµà´°à´àµà´·à´¾ à´²àµà´µàµ½ -securityLevel.customWarning = Custom -securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. -securityLevel.standard.level = Standard -securityLevel.standard.tooltip = Security Level : Standard -securityLevel.standard.summary = All Tor Browser and website features are enabled. -securityLevel.safer.level = Safer -securityLevel.safer.tooltip = Security Level : Safer -securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. -securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. -securityLevel.safer.description2 = Some fonts and math symbols are disabled. -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. -securityLevel.safest.level = Safest -securityLevel.safest.tooltip = Security Level : Safest -securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +securityLevel.customWarning = à´¨à´à´ªà´à´¿à´àµà´°à´®à´ +securityLevel.overview = നിà´àµà´à´³àµà´àµ à´¸àµà´°à´àµà´·à´¿à´¤à´¤àµà´µà´¤àµà´¤à´¿à´¨àµà´ à´ à´àµà´à´¾à´¤à´¤àµà´¤à´¿à´¨àµà´ à´àµà´àµà´à´ à´¸à´à´à´µà´¿à´àµà´àµà´¨àµà´¨ à´à´¿à´² à´µàµà´¬àµ വിശàµà´·à´£à´àµà´à´³àµà´ à´à´¾à´°àµà´¯à´àµà´à´³àµà´ നിരàµà´§à´¿à´àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ +securityLevel.standard.level = à´ à´à´àµà´àµà´¤à´®à´¾à´¯à´¤àµ +securityLevel.standard.tooltip = à´¸àµà´°à´àµà´·à´¿à´¤à´¤àµà´µà´¤àµà´¤à´¿à´¨àµà´±àµ പരിധി : മാനàµà´¯à´®à´¾à´¯à´¤àµ +securityLevel.standard.summary = à´à´²àµà´²à´¾ à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ വിശàµà´·à´£à´àµà´à´³àµà´ à´ à´¨àµà´µà´¦à´¿à´àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ +securityLevel.safer.level = à´¸àµà´°à´àµà´·à´¿à´¤à´®à´¾à´¯à´¤àµ +securityLevel.safer.tooltip = à´¸àµà´°à´àµà´·à´¿à´¤à´¤àµà´µà´¤àµà´¤à´¿à´¨àµà´±àµ പരിധി : à´¸àµà´°à´àµà´·à´¿à´¤à´®à´¾à´¯à´¤àµ +securityLevel.safer.summary = à´à´à´¯àµà´àµà´à´¿à´àµ à´àµà´°àµà´¤à´°à´®à´¾à´¯ à´µàµà´¬àµà´¸àµà´±àµà´±àµ വിശàµà´·à´£à´àµà´àµ¾ വിà´àµà´àµà´¦à´¿à´àµà´àµà´¨àµà´¨àµ , ഠതൠà´à´¿à´² à´µàµà´¬àµà´¸àµà´±àµà´±àµà´àµ¾ à´¸àµà´°à´¿à´¯à´¾à´¯ à´°àµà´¤à´¿à´¯à´¿àµ½ à´ªàµà´°àµà´µà´°àµà´¤à´¿à´àµà´àµà´¨àµà´¨à´¤à´¿à´¨àµ ബാധിà´àµà´àµà´¨àµà´¨àµ +securityLevel.safer.description1 = à´à´¾à´µà´¾à´¸àµà´àµà´°à´¿à´±àµà´ªàµ à´à´àµ à´à´¿ à´à´¿ പി à´à´¸àµ à´à´²àµà´²à´¾à´¤àµà´¤ à´¸àµà´±àµà´±àµà´à´³à´¿àµ½ നിരàµà´§à´¿à´àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ +securityLevel.safer.description2 = à´à´¿à´² à´ à´àµà´·à´° ലിപിà´à´³àµà´ à´à´£à´àµà´àµ à´àµà´àµà´àµà´¨àµà´¨ ലിപിà´à´³àµà´ നിരàµà´§à´¿à´àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ +securityLevel.safer.description3 = à´à´¾à´¨à´µàµà´ വിഡിയàµà´¯àµà´ (à´à´àµ à´à´¿ à´à´ à´àµ½ 5 à´®àµà´¡à´¿à´¯ ) à´àµà´à´¾à´¤àµ à´µàµà´¬àµ à´à´¿ à´àµ½ à´à´ ഠമർതàµà´¤à´¿à´¯à´¾àµ½ മാതàµà´°à´ à´ªàµà´°à´µàµ¼à´¤àµà´¤à´¿à´àµà´àµà´ +securityLevel.safest.level = à´¸àµà´°à´àµà´·à´¿à´¤à´®à´¾à´£àµà´¨àµà´¨àµ à´à´±à´ªàµà´ªàµà´³àµà´³à´¤àµ +securityLevel.safest.tooltip = à´¸àµà´°à´àµà´·à´¿à´¤à´¤àµà´µà´¤àµà´¤à´¿à´¨àµà´±àµ പരിധി : à´ à´à´µà´¶àµà´¯à´¤àµà´¤à´¿à´¨àµ à´¸àµà´°à´àµà´·à´¿à´¤à´®à´¾à´¯à´¤àµ +securityLevel.safest.summary = നിശàµà´à´²à´®à´¾à´¯ à´µàµà´¬àµà´¸àµà´±àµà´±àµ à´¨àµà´ സാധാരണ à´¸àµà´µà´¨à´¤àµà´¤à´¿à´¨àµà´ à´µàµà´£àµà´à´¿ à´µàµà´¬àµà´¸àµà´±àµà´±àµ വിശàµà´·à´£à´àµà´àµ¾ à´ à´¨àµà´µà´¦à´¿à´àµà´àµà´ . ഠമാറàµà´±à´àµà´àµ¾ à´à´¿à´¤àµà´°à´¤àµà´¤àµà´¯àµà´ മാധàµà´¯à´®à´¤àµà´¤àµà´¯àµà´ à´¸àµà´àµà´°à´¿à´ªàµà´±àµà´±àµà´à´³àµà´¯àµà´ ബാധിà´àµà´àµà´Â securityLevel.safest.description1 = à´à´²àµà´²à´¾ à´¸àµà´±àµà´±àµà´à´³à´¿àµ½ JavaScript à´¸àµà´µà´¤à´µàµ രഹിതമാà´àµà´à´¿à´¯à´¿à´°à´¿à´¯àµà´àµà´àµà´¨àµà´¨àµ. -securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled. -securityLevel.safest.description3 = Audio and video (HTML5 media) are
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit e60f9dcbde682690568fe56045820ea16d411375 Author: Translation commit bot Date: Thu Sep 12 08:21:41 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- ml/torbutton.dtd | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd index 112e0f60c..566ac88ed 100644 --- a/ml/torbutton.dtd +++ b/ml/torbutton.dtd @@ -3,7 +3,7 @@ - + @@ -22,20 +22,20 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Also update metrics-lib version for GitLab's CI.
commit d132d40f8b3723e41ce7baf32d624a38d08edeba Author: Karsten Loesing Date: Thu Sep 12 10:20:12 2019 +0200 Also update metrics-lib version for GitLab's CI. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67b5a4..5bd5623 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" + METRICS_LIB_VERSION: "2.7.0" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: ___ 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 6bd05f63a57c895cfa15d1f6ccc50fb273d86cae Author: Translation commit bot Date: Thu Sep 12 08:21:28 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties --- ml/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml/torbutton.properties b/ml/torbutton.properties index e3cc65f7d..8591898fa 100644 --- a/ml/torbutton.properties +++ b/ml/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country torbutton.circuit_display.guard = Guard torbutton.circuit_display.guard_note = Your [Guard] node may not change. -torbutton.circuit_display.learn_more = Learn more +torbutton.circuit_display.learn_more = à´àµà´àµà´¤àµ½ ഠറിയാൻ torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor @@ -36,7 +36,7 @@ torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determ # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now -canvas.notNowAccessKey=N +canvas.notNowAccessKey=à´àµ» canvas.allow=Allow in the future canvas.allowAccessKey=A canvas.never=Never for this site (recommended) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
