[tor-commits] [tor-browser-build/master] Bug 27174: update keyring/torbrowser.gpg to add new subkey
commit 48ff98c88e3359cfd0490acc9a0346b3d0c5bd3a Author: Nicolas Vigier Date: Thu Aug 16 23:17:10 2018 +0200 Bug 27174: update keyring/torbrowser.gpg to add new subkey --- keyring/torbrowser.gpg | Bin 49267 -> 125669 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index dfdee06..4f19dd0 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit e1df112720babdfd78ed73c8d9ea38c55bee2c02 Author: Translation commit bot Date: Thu Aug 16 19:45:03 2018 + Update translations for abouttor-homepage --- it/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index 5e43ed73f..bef8049ab 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -20,6 +20,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] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit 8b8cd9debd38a4b6588e34dec5e93d01d7957657 Author: Translation commit bot Date: Thu Aug 16 19:45:09 2018 + Update translations for abouttor-homepage_completed --- it/aboutTor.dtd | 42 +++--- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index a016f6bbf..bef8049ab 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -1,45 +1,25 @@ - - - - - - - - - + + - + https://duckduckgo.com";> - - - - - - - -https://www.torproject.org/download/download.html.en#warning";> + + + - - - - -https://www.torproject.org/docs/tor-doc-relay.html.en";> - -https://www.torproject.org/getinvolved/volunteer.html.en";> - -https://www.torproject.org/donate/donate.html.en";> + - - -https://www.torproject.org/about/overview.html.en";> + + +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] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit e92448beb51e5e0e023055112548baf5c825cf78 Author: Translation commit bot Date: Thu Aug 16 18:45:19 2018 + Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 072cfc7f2..5341aedf2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-12 05:26+\n" +"PO-Revision-Date: 2018-08-16 18:20+\n" "Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -295,7 +295,7 @@ msgstr "Köprülerim çalıÅmıyor! Yardım gerek!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Tor yazılımınız çalıÅmıyorsa %s adresine e-posta göndermelisiniz." +msgstr "Tor uygulamanız çalıÅmıyorsa %s adresine e-posta göndermelisiniz." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 23bda90f13b3f872b2f9a93fb6d7600a2ab4cf63 Author: Translation commit bot Date: Thu Aug 16 18:45:14 2018 + Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 072cfc7f2..5341aedf2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-12 05:26+\n" +"PO-Revision-Date: 2018-08-16 18:20+\n" "Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -295,7 +295,7 @@ msgstr "Köprülerim çalıÅmıyor! Yardım gerek!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Tor yazılımınız çalıÅmıyorsa %s adresine e-posta göndermelisiniz." +msgstr "Tor uygulamanız çalıÅmıyorsa %s adresine e-posta göndermelisiniz." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit e133d3d39d89b6af82c09a333114c5791b55dff6 Author: Translation commit bot Date: Thu Aug 16 18:45:09 2018 + Update translations for abouttor-homepage_completed --- he/aboutTor.dtd | 44 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 4b1c849fe..629b196ec 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -1,45 +1,25 @@ - - - - - - - - - + + - + https://duckduckgo.com";> - - - - - - - -https://www.torproject.org/download/download.html.en#warning";> - - - - - -https://www.torproject.org/docs/tor-doc-relay.html.en";> - -https://www.torproject.org/getinvolved/volunteer.html.en";> - -https://www.torproject.org/donate/donate.html.en";> + + + + + - - -https://www.torproject.org/about/overview.html.en";> + + +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] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit a107ccb1b678120e0d3e28b37db8c029c37ef901 Author: Translation commit bot Date: Thu Aug 16 18:45:04 2018 + Update translations for abouttor-homepage --- he/aboutTor.dtd | 16 nb/aboutTor.dtd | 12 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 46f110f4e..629b196ec 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - - + + - - + + https://www.torproject.org/getinvolved/volunteer.html.en";> diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index 7b37ddbe5..32af14627 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - - + + 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] [translation/exoneratorproperties] Update translations for exoneratorproperties
commit c172845c364828d398088d93ab026a077365d3af Author: Translation commit bot Date: Thu Aug 16 15:45:18 2018 + Update translations for exoneratorproperties --- pt_PT/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_PT/exonerator.properties b/pt_PT/exonerator.properties index 007d6514b..a660f2e9f 100644 --- a/pt_PT/exonerator.properties +++ b/pt_PT/exonerator.properties @@ -1,7 +1,7 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=Endereço de IP form.timestamp.label=Data -form.search.label=Search +form.search.label=Pesquisar summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s! ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/exoneratorproperties] Update translations for exoneratorproperties
commit 79a54dc55aa647ef07e6351bbc37cc17a62e5cf3 Author: Translation commit bot Date: Thu Aug 16 15:15:22 2018 + Update translations for exoneratorproperties --- pt_PT/exonerator.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_PT/exonerator.properties b/pt_PT/exonerator.properties index 936754ae5..007d6514b 100644 --- a/pt_PT/exonerator.properties +++ b/pt_PT/exonerator.properties @@ -1,6 +1,6 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: -form.ip.label=IP address -form.timestamp.label=Date +form.ip.label=Endereço de IP +form.timestamp.label=Data form.search.label=Search summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem @@ -42,7 +42,7 @@ technicaldetails.exit.unknown=Unknown technicaldetails.exit.yes=Yes technicaldetails.exit.no=No permanentlink.heading=Permanent link -footer.abouttor.heading=About Tor +footer.abouttor.heading=Sobre Tor footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by %s. Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator. The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin. Be sure to %s, and don't hesitate to %s for more information. footer.abouttor.body.link1=encrypting packets and sending them through a series of hops before they reach their destination footer.abouttor.body.link2=learn more about Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 6e2bfca303eddb8b3b54308d728a723e9f60 Author: Translation commit bot Date: Thu Aug 16 15:15:13 2018 + Update translations for bridgedb --- pt_PT/LC_MESSAGES/bridgedb.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po index a56840a74..1f6362c50 100644 --- a/pt_PT/LC_MESSAGES/bridgedb.po +++ b/pt_PT/LC_MESSAGES/bridgedb.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Manuela Silva , 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-06-22 13:51+\n" +"PO-Revision-Date: 2018-08-16 15:13+\n" "Last-Translator: Manuela Silva \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -35,15 +36,15 @@ msgstr "" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Comunicar um Errro" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "Código Fonte" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Registo de alterações" #: bridgedb/https/templates/base.html:88 msgid "Contact" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 9bc68849436244f3efa79478b2f38de70d4ac68e Author: Translation commit bot Date: Thu Aug 16 15:15:03 2018 + Update translations for abouttor-homepage --- pt_PT/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_PT/aboutTor.dtd b/pt_PT/aboutTor.dtd index 3eecc0bcd..f314daded 100644 --- a/pt_PT/aboutTor.dtd +++ b/pt_PT/aboutTor.dtd @@ -4,12 +4,12 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> - + - + https://duckduckgo.com";> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit 1c30d7ea494aee9301760e14a67973c232d30516 Author: Translation commit bot Date: Thu Aug 16 12:45:08 2018 + Update translations for abouttor-homepage_completed --- de/aboutTor.dtd | 42 +++--- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 8e1d77fc1..b5552c2c2 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -1,45 +1,25 @@ - - - - - - - - - + + - + https://duckduckgo.com";> - - - - - - - -https://www.torproject.org/download/download.html.en#warning";> + + + - - - - -https://www.torproject.org/docs/tor-doc-relay.html.en";> - -https://www.torproject.org/getinvolved/volunteer.html.en";> - -https://www.torproject.org/donate/donate.html.en";> + - - -https://www.torproject.org/about/overview.html.en";> + + +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] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit eba3afd9b76f241ee8f3920c307092bbb4a4b900 Author: Translation commit bot Date: Thu Aug 16 12:45:03 2018 + Update translations for abouttor-homepage --- de/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index a653661a9..b5552c2c2 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -20,6 +20,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] [tor/master] add make check-rustfmt
commit 32ad8e991999277948e896196731f2919c390f00 Author: cypherpunks Date: Mon Aug 6 14:45:13 2018 + add make check-rustfmt --- Makefile.am | 31 +++ 1 file changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3df35ad3f..35f9841e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -350,6 +350,37 @@ check-typos: echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install";; \ fi +.PHONY: rustfmt +rustfmt: +if USE_RUST + @if test -x "`which cargo-fmt 2>&1;true`"; then \ + echo "Formatting Rust code ..."; \ + (cd "$(top_srcdir)/src/rust" && cargo fmt --all --); \ + else \ + echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \ + echo "However, it seems that you don't have rustfmt installed."; \ + printf "You can install rustfmt by following the directions here:"; \ + echo " https://github.com/rust-lang-nursery/rustfmt";; \ + fi +endif + +.PHONY: check-rustfmt +check-rustfmt: +if USE_RUST + @if test -x "`which cargo-fmt 2>&1;true`"; then \ + printf "Running rustfmt..."; \ + (cd "$(top_srcdir)/src/rust" && cargo fmt --all -- --check && echo "done.") || \ + (echo " check-rustfmt failed. "; \ +echo " Run \`make rustfmt\` to apply the above changes."; \ +exit 1); \ + else \ + echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \ + echo "However, it seems that you don't have rustfmt installed."; \ + printf "You can install rustfmt by following the directions here:"; \ + echo " https://github.com/rust-lang-nursery/rustfmt";; \ + fi +endif + .PHONY: clippy clippy: if USE_RUST ___ 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 'pr275_squashed'
commit c8aecd14fecc55f5d8a48f793c24e3df68f1483c Merge: 7e50d43f0 6b609ce43 Author: Nick Mathewson Date: Thu Aug 16 08:43:05 2018 -0400 Merge branch 'pr275_squashed' Makefile.am | 31 doc/HACKING/CodingStandardsRust.md| 2 +- src/rust/.rustfmt.toml| 14 +++- src/rust/build.rs | 35 - src/rust/crypto/digests/sha2.rs | 36 + src/rust/crypto/lib.rs| 5 +- src/rust/crypto/rand/rng.rs | 29 +--- src/rust/external/crypto_digest.rs| 118 +- src/rust/external/crypto_rand.rs | 7 +- src/rust/external/external.rs | 9 +-- src/rust/protover/errors.rs | 38 ++ src/rust/protover/ffi.rs | 19 ++--- src/rust/protover/lib.rs | 7 +- src/rust/protover/protoset.rs | 62 ++-- src/rust/protover/protover.rs | 134 +- src/rust/protover/tests/protover.rs | 24 -- src/rust/smartlist/smartlist.rs | 10 +-- src/rust/tor_allocate/tor_allocate.rs | 14 ++-- src/rust/tor_log/tor_log.rs | 35 - src/rust/tor_rust/lib.rs | 4 +- src/rust/tor_util/ffi.rs | 4 +- src/rust/tor_util/strings.rs | 4 +- 22 files changed, 394 insertions(+), 247 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] rust: max_width=100, other rustfmt settings. #27071
commit ceac10fc3d664a5d7ee910965a5e0d15ea67adb1 Author: cypherpunks Date: Sat Aug 4 01:04:15 2018 + rust: max_width=100, other rustfmt settings. #27071 These are the 12 stable and documented configuration options, set to their default values. use_small_heuristics is only stabilized in rustfmt 0.9, so maintain support for 0.8.x for now by commenting it out. comment_width is unstable and did nothing, since wrap_comments defaults to false. Default values gotten from `rustfmt --print-config default rustfmt.toml`. https://github.com/rust-lang-nursery/rustfmt/blob/e7932fa9c2591c45a37a24305de90cb63128afcf/Configurations.md --- src/rust/.rustfmt.toml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/rust/.rustfmt.toml b/src/rust/.rustfmt.toml index f25bd5188..4ff839dcf 100644 --- a/src/rust/.rustfmt.toml +++ b/src/rust/.rustfmt.toml @@ -1,2 +1,12 @@ -max_width = 80 -comment_width = 80 +max_width = 100 +hard_tabs = false +tab_spaces = 4 +newline_style = "Unix" +#use_small_heuristics = "Default" +reorder_imports = true +reorder_modules = true +remove_nested_parens = true +merge_derives = true +use_try_shorthand = false +use_field_init_shorthand = false +force_explicit_abi = true ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] rust/docs: fix critical typo for missing_docs lint
commit fef2ba2267af831ff8579f8f63a898135954f44d Author: cypherpunks Date: Fri Aug 3 20:06:40 2018 + rust/docs: fix critical typo for missing_docs lint Fix typo from fe66d06a45a4714141eba992fe87ec3dd5fa1c22. The exclamation point is what lets an attribute apply to an entire crate, without the ! it's practically a placebo. Fix on commits af182d4ab51d6a1a70559bbdcd4ab842aa855684 and b6059297d7cb76f0e00e2098e38d6677d3033340, and note there are still missing docs in both crypto and protover, for now. https://doc.rust-lang.org/reference/attributes.html --- doc/HACKING/CodingStandardsRust.md | 2 +- src/rust/crypto/lib.rs | 3 ++- src/rust/protover/lib.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/CodingStandardsRust.md b/doc/HACKING/CodingStandardsRust.md index d9496c08f..fc562816d 100644 --- a/doc/HACKING/CodingStandardsRust.md +++ b/doc/HACKING/CodingStandardsRust.md @@ -104,7 +104,7 @@ repo. Documentation --- -You MUST include `#[deny(missing_docs)]` in your crate. +You MUST include `#![deny(missing_docs)]` in your crate. For function/method comments, you SHOULD include a one-sentence, "first person" description of function behaviour (see requirements for documentation as diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index f72a859dd..3b58935fd 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -24,7 +24,8 @@ //! assert!(result == [b'X'; DIGEST256_LEN]); //! ``` -#[deny(missing_docs)] +// XXX: add missing docs +//#![deny(missing_docs)] // External crates from cargo or TOR_RUST_DEPENDENCIES. extern crate digest; diff --git a/src/rust/protover/lib.rs b/src/rust/protover/lib.rs index 5da562c1e..4ea20665c 100644 --- a/src/rust/protover/lib.rs +++ b/src/rust/protover/lib.rs @@ -22,7 +22,8 @@ //! protocols to develop independently, without having to claim compatibility //! with specific versions of Tor. -#[deny(missing_docs)] +// XXX: add missing docs +//#![deny(missing_docs)] extern crate libc; extern crate smartlist; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] rust: run rustfmt
commit 6b609ce4356423a28e7b421a9f09849d831a0c6f
Author: cypherpunks
Date: Fri Aug 3 19:48:10 2018 +
rust: run rustfmt
---
src/rust/build.rs | 35 -
src/rust/crypto/digests/sha2.rs | 36 +
src/rust/crypto/lib.rs| 2 +-
src/rust/crypto/rand/rng.rs | 29 +---
src/rust/external/crypto_digest.rs| 118 +-
src/rust/external/crypto_rand.rs | 7 +-
src/rust/external/external.rs | 9 +--
src/rust/protover/errors.rs | 38 ++
src/rust/protover/ffi.rs | 19 ++---
src/rust/protover/lib.rs | 4 +-
src/rust/protover/protoset.rs | 62 ++--
src/rust/protover/protover.rs | 134 +-
src/rust/protover/tests/protover.rs | 24 --
src/rust/smartlist/smartlist.rs | 10 +--
src/rust/tor_allocate/tor_allocate.rs | 14 ++--
src/rust/tor_log/tor_log.rs | 35 -
src/rust/tor_rust/lib.rs | 4 +-
src/rust/tor_util/ffi.rs | 4 +-
src/rust/tor_util/strings.rs | 4 +-
19 files changed, 346 insertions(+), 242 deletions(-)
diff --git a/src/rust/build.rs b/src/rust/build.rs
index 2ac24b334..bf389cf7d 100644
--- a/src/rust/build.rs
+++ b/src/rust/build.rs
@@ -10,14 +10,12 @@
use std::collections::HashMap;
use std::env;
use std::fs::File;
-use std::io::prelude::*;
use std::io;
+use std::io::prelude::*;
use std::path::PathBuf;
/// Wrapper around a key-value map.
-struct Config(
-HashMap
-);
+struct Config(HashMap);
/// Locate a config.rust file generated by autoconf, starting in the OUT_DIR
/// location provided by cargo and recursing up the directory tree. Note that
@@ -31,9 +29,9 @@ fn find_cfg() -> io::Result {
return Ok(path.to_str().unwrap().to_owned());
}
path.pop(); // remove config.rust
-if ! path.pop() { // can't remove last part of directory
-return Err(io::Error::new(io::ErrorKind::NotFound,
- "No config.rust"));
+if !path.pop() {
+// can't remove last part of directory
+return Err(io::Error::new(io::ErrorKind::NotFound, "No
config.rust"));
}
}
}
@@ -55,12 +53,11 @@ impl Config {
}
let idx = match s.find("=") {
None => {
-return Err(io::Error::new(io::ErrorKind::InvalidData,
- "missing ="));
-},
-Some(x) => x
+return Err(io::Error::new(io::ErrorKind::InvalidData,
"missing ="));
+}
+Some(x) => x,
};
-let (var,eq_val) = s.split_at(idx);
+let (var, eq_val) = s.split_at(idx);
let val = &eq_val[1..];
map.insert(var.to_owned(), val.to_owned());
}
@@ -70,34 +67,34 @@ impl Config {
/// Return a reference to the value whose key is 'key'.
///
/// Panics if 'key' is not found in the configuration.
-fn get(&self, key : &str) -> &str {
+fn get(&self, key: &str) -> &str {
self.0.get(key).unwrap()
}
/// Add a dependency on a static C library that is part of Tor, by name.
-fn component(&self, s : &str) {
+fn component(&self, s: &str) {
println!("cargo:rustc-link-lib=static={}", s);
}
/// Add a dependency on a native library that is not part of Tor, by name.
-fn dependency(&self, s : &str) {
+fn dependency(&self, s: &str) {
println!("cargo:rustc-link-lib={}", s);
}
/// Add a link path, relative to Tor's build directory.
-fn link_relpath(&self, s : &str) {
+fn link_relpath(&self, s: &str) {
let builddir = self.get("BUILDDIR");
println!("cargo:rustc-link-search=native={}/{}", builddir, s);
}
/// Add an absolute link path.
-fn link_path(&self, s : &str) {
+fn link_path(&self, s: &str) {
println!("cargo:rustc-link-search=native={}", s);
}
/// Parse the CFLAGS in s, looking for -l and -L items, and adding
/// rust configuration as appropriate.
-fn from_cflags(&self, s : &str) {
+fn from_cflags(&self, s: &str) {
let mut next_is_lib = false;
let mut next_is_path = false;
for ent in self.get(s).split_whitespace() {
@@ -184,7 +181,7 @@ pub fn main() {
cfg.from_cflags("TOR_LZMA_LIBS");
cfg.from_cflags("TOR_ZSTD_LIBS");
cfg.from_cflags("LIBS");
-},
+}
_ => {
panic!("No configuration in build.rs for package {}", package);
}
diff --git a/src/rust/crypto/digests/sha2.rs b/src/rust/crypto/digests/sha2.rs
index d0246eeb9..55d002766 100644
--- a/src/rust/crypto/digests/sha2.rs
+++ b/src/rust/crypto/digests/sha2.rs
@@ -6,17 +6,17 @@
pub use digest::Dig
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit 908f1b8eb29f25758d4b3b0ff263e2d71725ce2d Merge: cd2ddf2e4 936e2aa0d Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit b49355915bf063448cf338fbb76061b601e5e333 Merge: 2deee972a 936e2aa0d Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit 1533e0c3503e277bafaaf9a7331fd653809e74c9 Merge: d78f25c07 b49355915 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit a79a86c6d806ecf3f40a618bdfdf832b04d81c81 Merge: 91d999e17 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
commit b49355915bf063448cf338fbb76061b601e5e333 Merge: 2deee972a 936e2aa0d Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit b49355915bf063448cf338fbb76061b601e5e333 Merge: 2deee972a 936e2aa0d Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Keep descriptor rotation time after HUP occurs.
commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): +- Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: `` + +Where can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit d78f25c077e937bc4fba862450bd6e337cbe4e76 Merge: 547522f56 2deee972a Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: `` + +Where can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit cd2ddf2e4e2c92c2421335cbf7917b61464cfb89 Merge: c80afbacd 4847e2216 Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 91d999e17e0f6787bead391cbe03c0beda069656 Merge: 8683c5653 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:34:23 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.4'
commit a7ea639f12d9a18c76c8a1c4e7eb00e75887a34d Merge: d029a5162 2deee972a Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.4' doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: `` + +Where can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: `` + +Where can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Rust: Say that we support rust stable in GettingStartedRust.md
commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: `` + +Where can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix test to pass without HOME env being set
commit f454c283031e282ade3db78ce9da3726ec4a0234
Author: rl1987
Date: Sun Aug 12 15:04:58 2018 +0300
Fix test to pass without HOME env being set
---
changes/bug27096| 3 +++
src/test/test_options.c | 14 ++
2 files changed, 17 insertions(+)
diff --git a/changes/bug27096 b/changes/bug27096
new file mode 100644
index 0..d1c139549
--- /dev/null
+++ b/changes/bug27096
@@ -0,0 +1,3 @@
+ o Minor bugfixes (testing):
+- Fix two unit tests to work when HOME environment variable is not
+ set. Fixes bug 27096; bugfix on 0.2.8.1-alpha.
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 4e890205b..dcb8932be 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -473,6 +473,11 @@ test_options_validate__uname_for_server(void *ignored)
{
(void)ignored;
char *msg;
+
+ int unset_home_env = 0;
+ if (setenv("HOME", "/home/john", 0) == 0)
+unset_home_env = 1;
+
options_test_data_t *tdata = get_options_test_data(
"ORPort 127.0.0.1:");
setup_capture_of_logs(LOG_WARN);
@@ -512,6 +517,8 @@ test_options_validate__uname_for_server(void *ignored)
free_options_test_data(tdata);
tor_free(msg);
teardown_capture_of_logs();
+ if (unset_home_env)
+unsetenv("HOME");
}
static void
@@ -1413,6 +1420,11 @@ test_options_validate__paths_needed(void *ignored)
(void)ignored;
int ret;
char *msg;
+
+ int unset_home_env = 0;
+ if (setenv("HOME", "/home/john", 0) == 0)
+unset_home_env = 1;
+
setup_capture_of_logs(LOG_WARN);
options_test_data_t *tdata = get_options_test_data(
"PathsNeededToBuildCircuits 0.1\n"
@@ -1455,6 +1467,8 @@ test_options_validate__paths_needed(void *ignored)
teardown_capture_of_logs();
free_options_test_data(tdata);
tor_free(msg);
+ if (unset_home_env)
+unsetenv("HOME");
}
static void
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Exclude setenv/unsetenv code on Windows
commit fb137b30fc69bb9fa4b417cfe47a8191ecf0a70c
Author: rl1987
Date: Sun Aug 12 15:28:34 2018 +0300
Exclude setenv/unsetenv code on Windows
---
src/test/test_options.c | 8
1 file changed, 8 insertions(+)
diff --git a/src/test/test_options.c b/src/test/test_options.c
index dcb8932be..801b5895f 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -474,9 +474,11 @@ test_options_validate__uname_for_server(void *ignored)
(void)ignored;
char *msg;
+#ifndef _WIN32
int unset_home_env = 0;
if (setenv("HOME", "/home/john", 0) == 0)
unset_home_env = 1;
+#endif
options_test_data_t *tdata = get_options_test_data(
"ORPort 127.0.0.1:");
@@ -517,8 +519,10 @@ test_options_validate__uname_for_server(void *ignored)
free_options_test_data(tdata);
tor_free(msg);
teardown_capture_of_logs();
+#ifndef _WIN32
if (unset_home_env)
unsetenv("HOME");
+#endif
}
static void
@@ -1421,9 +1425,11 @@ test_options_validate__paths_needed(void *ignored)
int ret;
char *msg;
+#ifndef _WIN32
int unset_home_env = 0;
if (setenv("HOME", "/home/john", 0) == 0)
unset_home_env = 1;
+#endif
setup_capture_of_logs(LOG_WARN);
options_test_data_t *tdata = get_options_test_data(
@@ -1467,8 +1473,10 @@ test_options_validate__paths_needed(void *ignored)
teardown_capture_of_logs();
free_options_test_data(tdata);
tor_free(msg);
+#ifndef _WIN32
if (unset_home_env)
unsetenv("HOME");
+#endif
}
static void
___
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 'ticket27096'
commit d029a5162d0f2a3255630500f9c81cc4f7bdc103 Merge: 34083f00a fb137b30f Author: Nick Mathewson Date: Thu Aug 16 08:32:06 2018 -0400 Merge branch 'ticket27096' changes/bug27096| 3 +++ src/test/test_options.c | 22 ++ 2 files changed, 25 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Picking up changes for build3
commit 1584f48516deaa01a21c704f625ab7203d5d8ea7 Author: Georg Koppen Date: Thu Aug 16 11:42:45 2018 + Picking up changes for build3 Fixed missing items in Changelog, correct sha256sum for new NoScript --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cda434d..5970d71 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -23,6 +23,7 @@ Tor Browser 8.0a10 -- August 20 2018 * Bug 27082: Enable a limited UITour for user onboarding * Bug 26961: New user onboarding * Bug 14952: Enable HTTP2 and AltSvc + * Bug 25735: Tor Browser stalls while loading Facebook login page * Bug 17252: Enable TLS session identifiers with first-party isolation * Bug 26353: Prevent speculative connects that violate first-party isolation * Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english @@ -137,6 +138,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25894: Get a rust cross-compiler for Windows * Bug 25554: Bump mingw-w64 version for ESR 60 * Bug 23561: Fix nsis builds for Windows 64 + * Bug 13469: Windows installer is missing many languages from NSIS file * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041 diff --git a/rbm.conf b/rbm.conf index 57de6cc..028f576 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bump the NoScript sha256sum value as well
commit b9f89a7b1224659fda8c2030e261e4e270d7c239
Author: Georg Koppen
Date: Thu Aug 16 11:27:47 2018 +
Bump the NoScript sha256sum value as well
---
projects/tor-browser/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 549df34..66dc989 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -69,7 +69,7 @@ input_files:
- filename: Bundle-Data
- URL:
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.8.16-an+fx.xpi
name: noscript
-sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0
+sha256sum: fdc539412a61e6109b9fd331c90bd73faa787eefe1ee8d06b57dc3d906c541cd
- filename: 'RelativeLink/start-tor-browser.desktop'
enable: '[% c("var/linux") %]'
- filename: 'RelativeLink/execdesktop'
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 335ab1c35c91587783d2780d20444c2964cb134c Author: Translation commit bot Date: Thu Aug 16 11:15:04 2018 + Update translations for abouttor-homepage --- is/aboutTor.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 63152e0ad..3bae74a99 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -6,20 +6,20 @@ - + - + https://duckduckgo.com";> - + - + - + 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] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 0d3c00ca3b611df6618d1c32b6362e183627961e Author: Translation commit bot Date: Thu Aug 16 10:45:04 2018 + Update translations for abouttor-homepage --- it/aboutTor.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index f373ceb13..5e43ed73f 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - + - + 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] [translation/bridgedb] Update translations for bridgedb
commit 1067a49a04b5d2d26c9f2967e86619a2e0f4cd04 Author: Translation commit bot Date: Thu Aug 16 10:45:12 2018 + Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index d188453de..ef3dbc72f 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-16 10:09+\n" +"PO-Revision-Date: 2018-08-16 10:21+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -159,7 +159,7 @@ msgstr "%sá%sááá®!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sá%sááá¦áá Bridge" +msgstr "%sá%sááá¦áá ááááááªááááá (Bridges)" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -189,7 +189,7 @@ msgstr "ááááá¡ááááááá BridgeDB-á¨á!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "ááááááá áá®áá ááááá ááá áááááªáááá¡ á¡áá®áááá (TYPE):" #: bridgedb/strings.py:56 #, python-format @@ -297,11 +297,11 @@ msgstr "áᥠáá áá¡ áá¥áááá á¡áá®ááá á®ááá #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "áááá¦áá ááááááªááá á®ááááá!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "ááá®ááá, ááá£ááááá áááááªáááá¡ á¡áá®á:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" @@ -310,7 +310,7 @@ msgstr "ááá¡áááá ááááá IPv6-ááá¡áááá ááá #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "ááá¡áááá ááááá %s?" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." @@ -322,7 +322,7 @@ msgstr "á¨ááá§ááááá á¡ááááááááá áááá #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "" +msgstr "á áááá á£ááá ááááááá§ááá ááááááªááá á®ááááá" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -358,7 +358,7 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "áá á¨áá¢á§áááááááá¡ á©áááááá." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being @@ -369,7 +369,7 @@ msgstr "" #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6-ááá¡áááá ááá¡ á®áááááá¡ áááá®áááá." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 @@ -380,4 +380,4 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "BridgeDB-á¡ á¡ááá¯áá á GnuPG-ááá¡áá¦áááá¡ ááá¦ááá." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Picking up tor-browser tag bump for build2
commit a8379c78e34dde020bbd3d123298ceff9e43bd13 Author: Georg Koppen Date: Thu Aug 16 10:39:30 2018 + Picking up tor-browser tag bump for build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index f0ea58e..57de6cc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bump tor-browser tag as well
commit 9901f022a04ab63aa84e3d41736b66d45e524efd
Author: Georg Koppen
Date: Thu Aug 16 10:38:45 2018 +
Bump tor-browser tag as well
---
projects/firefox/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 7546d24..2da425a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[%
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[%
c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[%
c("var/torbrowser_branch") %]-1-build3'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Release preparations for 8.0a10
commit fdfb70045d431257eb8654dfb49a8c4f70d2923e
Author: Georg Koppen
Date: Thu Aug 16 10:28:10 2018 +
Release preparations for 8.0a10
Versions bump and Changelog update
---
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 68 ++
projects/tor/config| 2 +-
rbm.conf | 6 +-
3 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index b8d30f1..cda434d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,71 @@
+Tor Browser 8.0a10 -- August 20 2018
+ * All platforms
+ * Update Tor to 0.3.4.6-rc
+ * Update Torbutton to 2.0.2
+ * Bug 26960: Implement new about:tor start page
+ * Bug 26961: Implement new user onboarding
+ * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
+ * Bug 26590: Use new svg.disabled pref in security slider
+ * Bug 26655: Adjust color and size of onion button
+ * Bug 26500: Reposition circuit display relay icon for RTL locales
+ * Bug 26409: Remove spoofed locale implementation
+ * Bug 26189: Remove content-policy.js
+ * Bug 27129: Add locales ca, ga, id, is, nb
+ * Translations update
+ * Update Tor Launcher to 0.2.16.2
+ * Bug 26985: Help button icons missing
+ * Bug 25509: Improve the proxy help text
+ * Bug 27129: Add locales ca, ga, id, is, nb
+ * Translations update
+ * Update NoScript to 10.1.8.16
+ * Update meek to 0.31
+ * Bug 26477: Make meek extension compatible with ESR 60
+ * Bug 27082: Enable a limited UITour for user onboarding
+ * Bug 26961: New user onboarding
+ * Bug 14952: Enable HTTP2 and AltSvc
+ * Bug 17252: Enable TLS session identifiers with first-party isolation
+ * Bug 26353: Prevent speculative connects that violate first-party isolation
+ * Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english
+ * Bug 26456: HTTP .onion sites inherit previous page's certificate
information
+ * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus
+ * Bug 26833: Backport Mozilla's bug 1473247
+ * Bug 26628: Backport Mozilla's bug 1470156
+ * Bug 26237: Clean up toolbar for ESR60-based Tor Browser
+ * Bug 26519: Avoid Firefox icons in ESR60
+ * Bug 26039: Load our preferences that modify extensions (fixup)
+ * Bug 26515: Update Tor Browser blog post URLs
+ * Bug 27129: Add locales ca, ga, id, is, nb
+ * Bug 26216: Fix broken MAR file generation
+ * Bug 26409: Remove spoofed locale implementation
+ * Bug 26603: Remove obsolete HTTP pipelining preferences
+ * Windows
+ * Bug 26514: Fix intermittent updater failures on Win64 (Error 19)
+ * Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9
+ * Bug 12968: Enable HEASLR in Windows x86_64 builds
+ * Bug 9145: Fix broken hardware acceleration
+ * Update tbb-windows-installer to 0.4
+ * Bug 26355: Update tbb-windows-installer to check for Windows7+
+ * Bug 26355: Require Windows7+ for updates to Tor Browser 8
+ * OS X
+ * Bug 26795: Bump snowflake to 6077141f4a for bug 25600
+ * Linux
+ * Bug 25485: Unbreak Tor Browser on systems with newer libstdc++
+ * Bug 20866: Fix OpenGL software rendering on systems with newer libstdc++
+ * Bug 26951+18022: Fix execdesktop argument passing
+ * Bug 26795: Bump snowflake to 6077141f4a for bug 25600
+ * Build System
+ * All
+ * Bug 26410: Stop using old MAR format in the alpha series
+ * Bug 27020: RBM build fails with runc version 1.0.1
+ * Bug 26949: Use GitHub repository for STIX
+ * Bug 26773: Add --verbose to the ./mach build flag for firefox
+ * Bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory
+ * Bug 26319: Don't package up Tor Browser in the `mach package` step
+ * OS X
+ * Bug 26489: Fix .app directory name in tools/dmg2mar
+ * Windows
+ * Bug 27152: Use mozilla/fxc2.git for the fxc2 repository
+
Tor Browser 8.0a9 -- June 27 2018
* All platforms
* Update Firefox to 60.1.0esr
diff --git a/projects/tor/config b/projects/tor/config
index c873db2..8c50e6f 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[%
c("var/build_id") %]'
-version: 0.3.4.2-alpha
+version: 0.3.4.6-rc
git_hash: 'tor-[% c("version") %]'
git_url: https://git.torproject.org/tor.git
git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index cd6dc08..f0ea58e 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '8.0a9'
- torbrowser_build: 'build3'
+ torbrowser_version: '8.0a10'
+ torbrowser_build: 'build1'
torbrowser_incremental_from:
-- 8.0a8
+-
[tor-commits] [tor-browser-build/master] Bug 25485: replace firefox by a wrapper script
commit 5933f5916a68fdafd7103a4800e156a0100c3a6c
Author: Nicolas Vigier
Date: Wed Aug 15 10:55:47 2018 +0200
Bug 25485: replace firefox by a wrapper script
In a previous patch for bug 25485 we changed how we set LD_LIBRARY_PATH
in start-tor-browser. However this change is not taken into account when
the browser is restarted by the updater. To avoid this issue we replace
the firefox binary by a wrapper setting LD_LIBRARY_PATH.
---
projects/firefox/build | 6 +-
projects/firefox/config | 2 ++
projects/firefox/start-firefox | 14 ++
projects/tor-browser/RelativeLink/start-tor-browser | 9 -
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 4dd0945..489d087 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -165,6 +165,10 @@ rm -f js/src/configure
# subsequent builds could test to see if they've been uploaded before...
# But let's find out if it actually matters first..
rm -f $distdir/Browser/*.chk
+ # Replace firefox by a wrapper script (#25485)
+ mv $distdir/Browser/firefox $distdir/Browser/firefox.real
+ mv $rootdir/start-firefox $distdir/Browser/firefox
+ chmod 755 $distdir/Browser/firefox
[% END %]
[% IF c("var/windows-x86_64") -%]
@@ -203,7 +207,7 @@ cd $distdir
[% IF c("var/linux-x86_64") %]
# Strip and generate debuginfo for the firefox binary that we keep, all *.so
# files, the plugin-container, and the updater (see ticket #10126)
- for LIB in Browser/*.so Browser/firefox Browser/plugin-container
Browser/updater
+ for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container
Browser/updater
do
objcopy --only-keep-debug $LIB Debug/$LIB
strip $LIB
diff --git a/projects/firefox/config b/projects/firefox/config
index 02a380d..7546d24 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -118,3 +118,5 @@ input_files:
enable: '[% c("var/windows") %]'
- filename: abicheck.cc
enable: '[% c("var/linux") %]'
+ - filename: start-firefox
+enable: '[% c("var/linux") %]'
diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox
new file mode 100644
index 000..dc30574
--- /dev/null
+++ b/projects/firefox/start-firefox
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+basedir=$(dirname "$0")
+
+LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/"
+# Check if the system has a more recent version of libstdc++.so.6; if yes, use
+# that instead of the bundled version.
+"$basedir/abicheck" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/"
+fi
+export LD_LIBRARY_PATH
+
+exec "$basedir/firefox.real" "$@"
diff --git a/projects/tor-browser/RelativeLink/start-tor-browser
b/projects/tor-browser/RelativeLink/start-tor-browser
index 47fbdef..722caa5 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -273,15 +273,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
exit 1
fi
-LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/"
-# Check if the system has a more recent version of libstdc++.so.6; if yes, use
-# that instead of the bundled version.
-./abicheck >/dev/null 2>&1
-if [ $? -ne 0 ]; then
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${HOME}/TorBrowser/Tor/libstdc++/"
-fi
-export LD_LIBRARY_PATH
-
[% IF ! c("var/release") %]
export SELFRANDO_write_layout_file=
[% END %]
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bump NoScript version to 10.1.8.16
commit c28ce61d5429ca305934c78c900d129570590fae
Author: Georg Koppen
Date: Thu Aug 16 08:27:36 2018 +
Bump NoScript version to 10.1.8.16
---
projects/tor-browser/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index e421dfe..549df34 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -67,7 +67,7 @@ input_files:
name: snowflake
enable: '[% c("var/snowflake") %]'
- filename: Bundle-Data
- - URL:
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.8.2-an+fx.xpi
+ - URL:
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.8.16-an+fx.xpi
name: noscript
sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0
- filename: 'RelativeLink/start-tor-browser.desktop'
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Adds changelog entry for #27050 changes
commit 2df25c2b5faf5574439dd1c1e4ca56200dd30f31 Author: Iain R. Learmonth Date: Wed Aug 15 23:42:00 2018 +0100 Adds changelog entry for #27050 changes --- CHANGELOG.md | 10 ++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6a28c4..b394a9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Changes in version 6.2-1.17.0 - -??-?? + + * Medium changes + - The "host_name" field will no longer appear in details documents. + - Names in the "verified_host_names" and "unverified_host_names" fields + are written in a deterministic order. + - If a reverse domain name lookup results in either no names being found + or an error then the lookup will be repeated at the next updater run. + + # Changes in version 6.2-1.16.1 - 2018-08-13 * Medium changes ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/master] Bump version to 6.2-1.17.0-dev.
commit 845e157cc23aff07b6943bc7fa1124d29449f85e
Author: Karsten Loesing
Date: Thu Aug 16 12:21:56 2018 +0200
Bump version to 6.2-1.17.0-dev.
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 7bce955..2cd6a7e 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.17.0-dev"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Prepare for 6.2-1.16.1 release.
commit 7d73a0c62723ac7423ab1223b6ab84a2f071cd0a
Author: Karsten Loesing
Date: Mon Aug 13 09:40:20 2018 +0200
Prepare for 6.2-1.16.1 release.
---
CHANGELOG.md | 2 +-
build.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b0d63..d6a28c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 6.2-1.16.? - 2018-08-??
+# Changes in version 6.2-1.16.1 - 2018-08-13
* Medium changes
- Fix JSON serialization of history objects.
diff --git a/build.xml b/build.xml
index 5acacaa..850b68b 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.16.1"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Fix JSON serialization of history objects.
commit 3be9f20055b0b427e5d8647540dc540330dd4332
Author: Karsten Loesing
Date: Wed Aug 8 10:56:12 2018 +0200
Fix JSON serialization of history objects.
Fixes #27039.
---
CHANGELOG.md | 6 ++
.../java/org/torproject/onionoo/docs/GraphHistory.java| 15 +++
2 files changed, 21 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99422f7..55b0d63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 6.2-1.16.? - 2018-08-??
+
+ * Medium changes
+ - Fix JSON serialization of history objects.
+
+
# Changes in version 6.2-1.16.0 - 2018-08-03
* Medium changes
diff --git a/src/main/java/org/torproject/onionoo/docs/GraphHistory.java
b/src/main/java/org/torproject/onionoo/docs/GraphHistory.java
index 495f01a..303bae4 100644
--- a/src/main/java/org/torproject/onionoo/docs/GraphHistory.java
+++ b/src/main/java/org/torproject/onionoo/docs/GraphHistory.java
@@ -3,8 +3,23 @@
package org.torproject.onionoo.docs;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
import java.util.List;
+/* Use snake_case for naming fields rather than camelCase. */
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+/* Exclude fields that are null or empty. */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+/* Only consider fields, no getters, setters, or constructors. */
+@JsonAutoDetect(creatorVisibility = JsonAutoDetect.Visibility.NONE,
+fieldVisibility = JsonAutoDetect.Visibility.ANY,
+getterVisibility = JsonAutoDetect.Visibility.NONE,
+isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+setterVisibility = JsonAutoDetect.Visibility.NONE)
public class GraphHistory {
private String first;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Fixes for reverse DNS resolver
commit 4b05f840fc19d81d5e05f8b0b89c80473024f07a
Author: Iain R. Learmonth
Date: Tue Aug 14 12:51:40 2018 +0100
Fixes for reverse DNS resolver
* SortedSets are used in place of Lists to ensure deterministic
ordering of looked up names
* The NodeStatus serialization is extended to include verified
and unverified host names
* The existing host name field in NodeStatus serializations is
removed and a placeholder inserted
* The last reverse DNS lookup time is now only updated on successful
lookups
* The host name field is removed from summary and details documents
* Tests are updated to use SortedSets in place of Lists
Fixes: #27050
---
.../torproject/onionoo/docs/DetailsDocument.java | 21 +-
.../org/torproject/onionoo/docs/DetailsStatus.java | 16
.../org/torproject/onionoo/docs/DocumentStore.java | 7 ++--
.../org/torproject/onionoo/docs/NodeStatus.java| 47 --
.../torproject/onionoo/docs/SummaryDocument.java | 17
.../org/torproject/onionoo/server/NodeIndexer.java | 9 ++---
.../torproject/onionoo/server/ResponseBuilder.java | 2 -
.../onionoo/updater/NodeDetailsStatusUpdater.java | 33 ---
.../onionoo/updater/RdnsLookupRequest.java | 24 ---
.../onionoo/updater/RdnsLookupWorker.java | 13 ++
.../onionoo/updater/ReverseDomainNameResolver.java | 19 +++--
.../onionoo/writer/DetailsDocumentWriter.java | 1 -
.../onionoo/writer/SummaryDocumentWriter.java | 8 ++--
.../onionoo/docs/SummaryDocumentTest.java | 2 +-
.../onionoo/server/ResourceServletTest.java| 19 +
.../server/SummaryDocumentComparatorTest.java | 2 +-
16 files changed, 98 insertions(+), 142 deletions(-)
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index 650ba5b..5e53d4c 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
+import java.util.TreeSet;
public class DetailsDocument extends Document {
@@ -260,19 +261,19 @@ public class DetailsDocument extends Document {
return unescapeJson(this.hostName);
}
- private List verifiedHostNames;
+ private SortedSet verifiedHostNames;
/**
* Creates a copy of the list with each string escaped for JSON compatibility
* and sets this as the verified host names, unless the argument was null in
* which case the verified host names are just set to null.
*/
- public void setVerifiedHostNames(List verifiedHostNames) {
+ public void setVerifiedHostNames(SortedSet verifiedHostNames) {
if (null == verifiedHostNames) {
this.verifiedHostNames = null;
return;
}
-this.verifiedHostNames = new ArrayList<>();
+this.verifiedHostNames = new TreeSet<>();
for (String hostName : verifiedHostNames) {
this.verifiedHostNames.add(escapeJson(hostName));
}
@@ -283,30 +284,30 @@ public class DetailsDocument extends Document {
* compatibility reversed and returns the copy, unless the held reference was
* null in which case null is returned.
*/
- public List getVerifiedHostNames() {
+ public SortedSet getVerifiedHostNames() {
if (null == this.verifiedHostNames) {
return null;
}
-List verifiedHostNames = new ArrayList<>();
+SortedSet verifiedHostNames = new TreeSet<>();
for (String escapedHostName : this.verifiedHostNames) {
verifiedHostNames.add(unescapeJson(escapedHostName));
}
return verifiedHostNames;
}
- private List unverifiedHostNames;
+ private SortedSet unverifiedHostNames;
/**
* Creates a copy of the list with each string escaped for JSON compatibility
* and sets this as the unverified host names, unless the argument was null
in
* which case the unverified host names are just set to null.
*/
- public void setUnverifiedHostNames(List unverifiedHostNames) {
+ public void setUnverifiedHostNames(SortedSet unverifiedHostNames) {
if (null == unverifiedHostNames) {
this.unverifiedHostNames = null;
return;
}
-this.unverifiedHostNames = new ArrayList<>();
+this.unverifiedHostNames = new TreeSet<>();
for (String hostName : unverifiedHostNames) {
this.unverifiedHostNames.add(escapeJson(hostName));
}
@@ -317,11 +318,11 @@ public class DetailsDocument extends Document {
* compatibility reversed and returns the copy, unless the held reference was
* null in which case null is returned.
*/
- public List getUnverifiedHostNames() {
+ public SortedSet getUnverifiedHostNames() {
if (null == this.unverifiedHostNames) {
return null;
}
-List unverifiedHostNames = ne
[tor-commits] [onionoo/release] Adds JavaDoc for NodeStatus class
commit 02f3d0ce5661ee4552b1076b7c6b3bb0fef0353c
Author: Iain R. Learmonth
Date: Tue Aug 14 14:15:03 2018 +0100
Adds JavaDoc for NodeStatus class
---
.../org/torproject/onionoo/docs/NodeStatus.java| 63 +-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index b2b6c8e..c0c6adf 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -23,6 +23,58 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
+/**
+ * NodeStatus documents contain persistent state for data about relays. These
+ * are read by the hourly updater and then updated with new details where there
+ * are relevant descriptors, consensuses or other documents available.
+ *
+ * At the end of each run of the hourly updater, these documents are
+ * concatenated and written to a single file in status/summary.
+ * Each line contains a single document.
+ *
+ * A new NodeStatus can be created from a string using the
+ * {@link #fromString(String)} static method. To create a serialization, the
+ * {@link #toString()} method can be used.
+ *
+ * The lines are formed of tab-separated values. There must be at least
+ * 23 fields present in the document. Additional fields may be present but
+ * are not required for the document to be valid. A summary of the encoding
+ * can be found here:
+ *
+ *
+ * "r" or "b" to represent a relay or a bridge
+ * Nickname
+ * ASCII representation of hex-encoded fingerprint
+ * OR Addresses
+ * Last seen (date portion)
+ * Last seen (time portion)
+ * OR Port
+ * Dir Port
+ * Relay Flags
+ * Consensus Weight
+ * Country Code
+ * Blank field (previously used for host name)
+ * Last reverse DNS lookup time (milliseconds)
+ * Default policy
+ * Port list
+ * First seen (date portion)
+ * First seen (time portion)
+ * Last address change (date portion)
+ * Last address change (time portion)
+ * AS Number
+ * Contact
+ * Recommended version (boolean)
+ * Family
+ * Version
+ * Blank field (previously used for host name)
+ * Version status
+ * AS Name
+ * Verified and unverified host names
+ *
+ *
+ * This list only provides a summary, individual fields can have
+ * complex encodings with nested lists.
+ */
public class NodeStatus extends Document {
private static final Logger log = LoggerFactory.getLogger(
@@ -489,7 +541,14 @@ public class NodeStatus extends Document {
}
/** Instantiates a new node status object from the given string that may
- * have been produced by {@link #toString()}. */
+ * have been produced by {@link #toString()}. A document that has been
+ * written by a previous version of Onionoo that did not include all the
+ * currently supported fields will still be accepted, but will contain
+ * the new fields if serialized again using {@link #toString()}. A
+ * document that has been generated by a newer version of Onionoo that
+ * contains new fields will be accepted, but those new fields will be
+ * ignored and the data discarded if serialized again using
+ * {@link #toString()}. */
public static NodeStatus fromString(String documentString) {
try {
String[] parts = documentString.trim().split("\t");
@@ -648,6 +707,8 @@ public class NodeStatus extends Document {
}
}
+ /** Generates a String serialization of the node status object that could
+ * be used by {@link #fromString(String)} to recreate this object. */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Prepare for 6.2-1.17.0 release.
commit 1e61073ecfe4fe16c788c7061ddde090963bc166
Author: Karsten Loesing
Date: Thu Aug 16 10:58:05 2018 +0200
Prepare for 6.2-1.17.0 release.
---
CHANGELOG.md | 2 +-
build.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b394a9f..84c6dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 6.2-1.17.0 - -??-??
+# Changes in version 6.2-1.17.0 - 2018-08-16
* Medium changes
- The "host_name" field will no longer appear in details documents.
diff --git a/build.xml b/build.xml
index cd69295..7bce955 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.17.0"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Remove pointless assignment in NodeStatus
commit 6c94482adbd651d787ecc3c32d5d1d79395db7af
Author: Iain R. Learmonth
Date: Tue Aug 14 14:21:06 2018 +0100
Remove pointless assignment in NodeStatus
Fixes: #27124
---
src/main/java/org/torproject/onionoo/docs/NodeStatus.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 63720d9..50c66f9 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -565,8 +565,7 @@ public class NodeStatus extends Document {
if (!parts[14].equals("null")) {
nodeStatus.setPortList(parts[14]);
}
- long firstSeenMillis = lastSeenMillis;
- firstSeenMillis = DateTimeHelper.parse(parts[15] + " " + parts[16]);
+ long firstSeenMillis = DateTimeHelper.parse(parts[15] + " " + parts[16]);
if (firstSeenMillis < 0L) {
log.error("Parse exception while parsing node status "
+ "line '" + documentString + "'. Skipping.");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Bump version to 6.2-1.16.1-dev.
commit 0c5d37441da66ce3af9a85ee8902dbe6a07fb352
Author: Karsten Loesing
Date: Mon Aug 13 14:35:43 2018 +0200
Bump version to 6.2-1.16.1-dev.
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 850b68b..cd69295 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.16.1-dev"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/release] Bump version to 6.2-1.16.0-dev.
commit b77ee97bfbf837fc3353e9414ad291e54e03d5bc
Author: Karsten Loesing
Date: Fri Aug 3 16:36:24 2018 +0200
Bump version to 6.2-1.16.0-dev.
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 5af2474..5acacaa 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.16.0-dev"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/master] Prepare for 6.2-1.17.0 release.
commit 1e61073ecfe4fe16c788c7061ddde090963bc166
Author: Karsten Loesing
Date: Thu Aug 16 10:58:05 2018 +0200
Prepare for 6.2-1.17.0 release.
---
CHANGELOG.md | 2 +-
build.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b394a9f..84c6dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 6.2-1.17.0 - -??-??
+# Changes in version 6.2-1.17.0 - 2018-08-16
* Medium changes
- The "host_name" field will no longer appear in details documents.
diff --git a/build.xml b/build.xml
index cd69295..7bce955 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
+value="${onionoo.protocol.version}-1.17.0"/>
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 9c5872ab90752f2a65721fee3582e3c89579b5a1 Author: Translation commit bot Date: Thu Aug 16 10:15:10 2018 + Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index f389da178..d188453de 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-16 09:16+\n" +"PO-Revision-Date: 2018-08-16 10:09+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgstr "ááááá¯á %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "áá®áá %s áááááá¢áá ááááááªááá á®ááááá Tor Browser-á¡ %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -131,7 +131,7 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sá£%sáá áááá áááááªáá ááááááªááá á®ááááá!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -159,7 +159,7 @@ msgstr "%sá%sááá®!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sá%sááá¦áá Bridge" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -167,7 +167,7 @@ msgstr "[áá¡ ááá¢áááá¢á£á á á¬áá áááá; ááá® #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "áá¥áááá ááááááªááá á®ááááá:" #: bridgedb/strings.py:47 #, python-format @@ -212,7 +212,7 @@ msgstr "á¡áá¯áá á ááá¡áá¦ááááá" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "áá¡ á¬áá ááá á¨ááá¥ááá áªáá¡áá á¢á§áááá¡ á¤áá áááá, áá¦ááá á£áá áá á¡ááááááá áá áá áá§áááááááá\n%s-áá¡áááá¡, ááá áá¦á %s, áá á %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -261,7 +261,7 @@ msgstr "%s á®ááááá %s áá áá¡ Tor-áá¡ ááááááªá #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "á¡á®áá ááááá ááá¡áááá áááá ááááááªáá á®ááááááá á¬áááááá¡ ááá¡áá¦áááá!" #: bridgedb/strings.py:108 #, python-format @@ -269,7 +269,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "ááááá áá áá á¡áá¨á£áááááá ááááááªááá á®áááááá¡ ááá¡áá¦áááá, á áá ááááááááá ááá¤áá¡á¢á ááá¡áááá ááá %s. ááá®ááá ááááááááá¡á¬áááá, á áá á¬áá ááá áááááááááááá á£ááá áá§áá¡ ááá¤áá¡á¢áá¡ áááá¡áá®á£á áááá¡ á ááááááá áá áááá¬ááááááá¡ á¤áá¡á¢áááá:\n%s, %s áá %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Move bn-BD to locales for non-official builds
commit d06cb31abd3a5b45bc70b3ba3a4fb70198779a36 Author: Georg Koppen Date: Thu Aug 16 10:14:00 2018 + Move bn-BD to locales for non-official builds --- trans_tools/import-translations.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 342188d0..adb728a9 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,14 +2,16 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar bn-BD ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain # so Basque XPIs can be build independently. We can do # this for other languages too, if anyone requests this # and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu" +# XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug +# 26498. Others might want to fix, build, and use it, though. +BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" LOCALE_DIR=../src/chrome/locale ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation-tools/master] better with the extension
commit d8c0463d8b9a613345dee1f24554bffd436f38ff Author: emma peel Date: Thu Aug 16 10:01:08 2018 + better with the extension --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index d4f50a6..97ee9cc 100644 --- a/config +++ b/config @@ -31,7 +31,7 @@ torbutton-torbuttondtd torbutton-torbuttondtd_completed torbutton-aboutdialogdtd torbutton-aboutdialogdtd_completed torbutton-abouttorproperties torbutton-abouttorproperties_completed torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed -torbutton-browseronboarding torbutton-browseronboarding_completed +torbutton-browseronboardingproperties torbutton-browseronboardingproperties_completed torcheck torcheck_completed tor-launcher-properties tor-launcher-properties_completed tor-launcher-network-settings tor-launcher-network-settings_completed ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Revert "Backport of fix for bug 1412081"
commit bd4abf8ba8f4e1aea2acd4b895274f646ed951a8
Author: Georg Koppen
Date: Thu Aug 16 07:21:24 2018 +
Revert "Backport of fix for bug 1412081"
This reverts commit 50f4653b90316394e7d6d3cd4a3e92e12f377666.
We take the patch that actually landed on esr60 instead.
---
dom/ipc/ContentPrefs.cpp | 1 -
xpcom/io/FilePreferences.cpp | 328 ++
xpcom/io/FilePreferences.h| 6 -
xpcom/io/nsLocalFileUnix.cpp | 58 -
xpcom/tests/gtest/TestFilePreferencesUnix.cpp | 203
xpcom/tests/gtest/moz.build | 5 -
6 files changed, 122 insertions(+), 479 deletions(-)
diff --git a/dom/ipc/ContentPrefs.cpp b/dom/ipc/ContentPrefs.cpp
index ac1ea109fc9f..d011c7393125 100644
--- a/dom/ipc/ContentPrefs.cpp
+++ b/dom/ipc/ContentPrefs.cpp
@@ -270,7 +270,6 @@ const char* mozilla::dom::ContentPrefs::gEarlyPrefs[] = {
"network.dns.disablePrefetch",
"network.dns.disablePrefetchFromHTTPS",
"network.file.disable_unc_paths",
- "network.file.path_blacklist",
"network.http.tailing.enabled",
"network.jar.block-remote-files",
"network.loadinfo.skip_type_assertion",
diff --git a/xpcom/io/FilePreferences.cpp b/xpcom/io/FilePreferences.cpp
index ca133fcaeb40..3ad0e0ee19e0 100644
--- a/xpcom/io/FilePreferences.cpp
+++ b/xpcom/io/FilePreferences.cpp
@@ -6,11 +6,7 @@
#include "FilePreferences.h"
-#include "mozilla/ClearOnShutdown.h"
#include "mozilla/Preferences.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/Tokenizer.h"
-#include "mozilla/Unused.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryServiceDefs.h"
#include "nsDirectoryServiceUtils.h"
@@ -19,37 +15,15 @@ namespace mozilla {
namespace FilePreferences {
static bool sBlockUNCPaths = false;
-typedef nsTArray WinPaths;
-static StaticAutoPtr sWhitelist;
+typedef nsTArray Paths;
-static WinPaths& PathWhitelist()
+static Paths& PathArray()
{
- if (!sWhitelist) {
-sWhitelist = new nsTArray();
-ClearOnShutdown(&sWhitelist);
- }
- return *sWhitelist;
-}
-
-#ifdef XP_WIN
-typedef char16_t char_path_t;
-#else
-typedef char char_path_t;
-#endif
-
-typedef nsTArray> Paths;
-static StaticAutoPtr sBlacklist;
-
-static Paths& PathBlacklist()
-{
- if (!sBlacklist) {
-sBlacklist = new nsTArray>();
-ClearOnShutdown(&sBlacklist);
- }
- return *sBlacklist;
+ static Paths sPaths;
+ return sPaths;
}
-static void AllowUNCDirectory(char const* directory)
+static void AllowDirectory(char const* directory)
{
nsCOMPtr file;
NS_GetSpecialDirectory(directory, getter_AddRefs(file));
@@ -69,201 +43,180 @@ static void AllowUNCDirectory(char const* directory)
return;
}
- if (!PathWhitelist().Contains(path)) {
-PathWhitelist().AppendElement(path);
+ if (!PathArray().Contains(path)) {
+PathArray().AppendElement(path);
}
}
void InitPrefs()
{
sBlockUNCPaths = Preferences::GetBool("network.file.disable_unc_paths",
false);
-
- PathBlacklist().Clear();
- nsAutoCString blacklist;
- Preferences::GetCString("network.file.path_blacklist", blacklist);
-
- Tokenizer p(blacklist);
- while (!p.CheckEOF()) {
-nsCString path;
-Unused << p.ReadUntil(Tokenizer::Token::Char(','), path);
-path.Trim(" ");
-if (!path.IsEmpty()) {
-#ifdef XP_WIN
- PathBlacklist().AppendElement(NS_ConvertASCIItoUTF16(path));
-#else
- PathBlacklist().AppendElement(path);
-#endif
-}
-Unused << p.CheckChar(',');
- }
}
void InitDirectoriesWhitelist()
{
// NS_GRE_DIR is the installation path where the binary resides.
- AllowUNCDirectory(NS_GRE_DIR);
+ AllowDirectory(NS_GRE_DIR);
// NS_APP_USER_PROFILE_50_DIR and NS_APP_USER_PROFILE_LOCAL_50_DIR are the
two
// parts of the profile we store permanent and local-specific data.
- AllowUNCDirectory(NS_APP_USER_PROFILE_50_DIR);
- AllowUNCDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR);
+ AllowDirectory(NS_APP_USER_PROFILE_50_DIR);
+ AllowDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR);
}
namespace { // anon
-template
class Normalizer
{
public:
- Normalizer(const nsTSubstring& aFilePath, const TChar aSeparator)
-: mFilePathCursor(aFilePath.BeginReading())
-, mFilePathEnd(aFilePath.EndReading())
-, mSeparator(aSeparator)
- {
- }
+ Normalizer(const nsAString& aFilePath, const char16_t aSeparator);
+ bool Get(nsAString& aNormalizedFilePath);
- bool Get(nsTSubstring& aNormalizedFilePath)
- {
-aNormalizedFilePath.Truncate();
-
-// Windows UNC paths begin with double separator (\\)
-// Linux paths begin with just one separator (/)
-// If we want to use the normalizer for regular windows paths this code
-// will need to be updated.
-#ifdef XP_WIN
-if (IsEOF()) {
- return true;
-}
-if (ConsumeSeparator()) {
- aNormalizedFilePath.Append(mSeparator);
-}
-#endif
+private:
+ bool ConsumeItem();
+ bool ConsumeSeparator();
+
[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1412081 - Add ability to blacklist file paths on Unix platforms. r=mayhemer, a=RyanVM
commit dae353ff5f2d033b9b87ebf2a5f833c87068d4a3
Author: Valentin Gosu
Date: Thu Jun 21 00:09:15 2018 +0200
Bug 1412081 - Add ability to blacklist file paths on Unix platforms.
r=mayhemer, a=RyanVM
--HG--
extra : source : 92ff98e2731eac0558cbc7e9c71e521246772240
extra : amend_source : e01976f9592cd2635c075cc6031e81a1b1e1b8bd
---
dom/ipc/ContentPrefs.cpp | 1 +
xpcom/io/FilePreferences.cpp | 329 --
xpcom/io/FilePreferences.h| 6 +
xpcom/io/nsLocalFileUnix.cpp | 58 +
xpcom/tests/gtest/TestFilePreferencesUnix.cpp | 203
xpcom/tests/gtest/TestFilePreferencesWin.cpp | 4 +
xpcom/tests/gtest/moz.build | 5 +
7 files changed, 485 insertions(+), 121 deletions(-)
diff --git a/dom/ipc/ContentPrefs.cpp b/dom/ipc/ContentPrefs.cpp
index d011c7393125..ac1ea109fc9f 100644
--- a/dom/ipc/ContentPrefs.cpp
+++ b/dom/ipc/ContentPrefs.cpp
@@ -270,6 +270,7 @@ const char* mozilla::dom::ContentPrefs::gEarlyPrefs[] = {
"network.dns.disablePrefetch",
"network.dns.disablePrefetchFromHTTPS",
"network.file.disable_unc_paths",
+ "network.file.path_blacklist",
"network.http.tailing.enabled",
"network.jar.block-remote-files",
"network.loadinfo.skip_type_assertion",
diff --git a/xpcom/io/FilePreferences.cpp b/xpcom/io/FilePreferences.cpp
index 3ad0e0ee19e0..9467c055d9bf 100644
--- a/xpcom/io/FilePreferences.cpp
+++ b/xpcom/io/FilePreferences.cpp
@@ -6,7 +6,11 @@
#include "FilePreferences.h"
+#include "mozilla/ClearOnShutdown.h"
#include "mozilla/Preferences.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/Tokenizer.h"
+#include "mozilla/Unused.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryServiceDefs.h"
#include "nsDirectoryServiceUtils.h"
@@ -15,15 +19,37 @@ namespace mozilla {
namespace FilePreferences {
static bool sBlockUNCPaths = false;
-typedef nsTArray Paths;
+typedef nsTArray WinPaths;
+static StaticAutoPtr sWhitelist;
-static Paths& PathArray()
+static WinPaths& PathWhitelist()
{
- static Paths sPaths;
- return sPaths;
+ if (!sWhitelist) {
+sWhitelist = new nsTArray();
+ClearOnShutdown(&sWhitelist);
+ }
+ return *sWhitelist;
+}
+
+#ifdef XP_WIN
+typedef char16_t char_path_t;
+#else
+typedef char char_path_t;
+#endif
+
+typedef nsTArray> Paths;
+static StaticAutoPtr sBlacklist;
+
+static Paths& PathBlacklist()
+{
+ if (!sBlacklist) {
+sBlacklist = new nsTArray>();
+ClearOnShutdown(&sBlacklist);
+ }
+ return *sBlacklist;
}
-static void AllowDirectory(char const* directory)
+static void AllowUNCDirectory(char const* directory)
{
nsCOMPtr file;
NS_GetSpecialDirectory(directory, getter_AddRefs(file));
@@ -43,180 +69,202 @@ static void AllowDirectory(char const* directory)
return;
}
- if (!PathArray().Contains(path)) {
-PathArray().AppendElement(path);
+ if (!PathWhitelist().Contains(path)) {
+PathWhitelist().AppendElement(path);
}
}
void InitPrefs()
{
sBlockUNCPaths = Preferences::GetBool("network.file.disable_unc_paths",
false);
+
+ PathBlacklist().Clear();
+ nsAutoCString blacklist;
+ Preferences::GetCString("network.file.path_blacklist", blacklist);
+
+ Tokenizer p(blacklist);
+ while (!p.CheckEOF()) {
+nsCString path;
+Unused << p.ReadUntil(Tokenizer::Token::Char(','), path);
+path.Trim(" ");
+if (!path.IsEmpty()) {
+#ifdef XP_WIN
+ PathBlacklist().AppendElement(NS_ConvertASCIItoUTF16(path));
+#else
+ PathBlacklist().AppendElement(path);
+#endif
+}
+Unused << p.CheckChar(',');
+ }
}
void InitDirectoriesWhitelist()
{
// NS_GRE_DIR is the installation path where the binary resides.
- AllowDirectory(NS_GRE_DIR);
+ AllowUNCDirectory(NS_GRE_DIR);
// NS_APP_USER_PROFILE_50_DIR and NS_APP_USER_PROFILE_LOCAL_50_DIR are the
two
// parts of the profile we store permanent and local-specific data.
- AllowDirectory(NS_APP_USER_PROFILE_50_DIR);
- AllowDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR);
+ AllowUNCDirectory(NS_APP_USER_PROFILE_50_DIR);
+ AllowUNCDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR);
}
namespace { // anon
-class Normalizer
+template
+class TNormalizer
{
public:
- Normalizer(const nsAString& aFilePath, const char16_t aSeparator);
- bool Get(nsAString& aNormalizedFilePath);
-
-private:
- bool ConsumeItem();
- bool ConsumeSeparator();
- bool IsEOF() { return mFilePathCursor == mFilePathEnd; }
+ TNormalizer(const nsTSubstring& aFilePath, const TChar aSeparator)
+: mFilePathCursor(aFilePath.BeginReading())
+, mFilePathEnd(aFilePath.EndReading())
+, mSeparator(aSeparator)
+ {
+ }
- bool ConsumeName();
- bool CheckParentDir();
- bool CheckCurrentDir();
+ bool Get(nsTSubstring& aNormalizedFilePath)
+ {
+aNormalizedFilePath.Truncate();
+
+// Windows UNC paths begin with double separator (\\)
+// Linux paths begin with just one separator (
[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1483377 - Use static array for FilePreferences whitelist instead of StaticAutoPtr. r=mayhemer, a=RyanVM
commit bd0c7567cd0135e87908f436d1f394ce8c910fef
Author: Valentin Gosu
Date: Tue Aug 14 21:55:20 2018 +
Bug 1483377 - Use static array for FilePreferences whitelist instead of
StaticAutoPtr. r=mayhemer, a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D3403
--HG--
extra : amend_source : b1eff8c536bcec5112211007347f558e32164905
---
xpcom/io/FilePreferences.cpp | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/xpcom/io/FilePreferences.cpp b/xpcom/io/FilePreferences.cpp
index 9467c055d9bf..5017757ce0fc 100644
--- a/xpcom/io/FilePreferences.cpp
+++ b/xpcom/io/FilePreferences.cpp
@@ -20,15 +20,11 @@ namespace FilePreferences {
static bool sBlockUNCPaths = false;
typedef nsTArray WinPaths;
-static StaticAutoPtr sWhitelist;
static WinPaths& PathWhitelist()
{
- if (!sWhitelist) {
-sWhitelist = new nsTArray();
-ClearOnShutdown(&sWhitelist);
- }
- return *sWhitelist;
+ static WinPaths sPaths;
+ return sPaths;
}
#ifdef XP_WIN
@@ -261,9 +257,6 @@ private:
bool IsBlockedUNCPath(const nsAString& aFilePath)
{
typedef TNormalizer Normalizer;
- if (!sWhitelist) {
-return false;
- }
if (!sBlockUNCPaths) {
return false;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit e4fdd74ef57c4e7ea846e76e3e3418006e33bb64 Author: Translation commit bot Date: Thu Aug 16 09:45:10 2018 + Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index 5939f2d36..f389da178 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-16 08:42+\n" +"PO-Revision-Date: 2018-08-16 09:16+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -184,7 +184,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "ááááá¡ááááááá BridgeDB-á¨á!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation-tools/master] add torbutton-onboarding strings
commit 6bfd685b9a81650fea0177a51301cb6e7a6a1988 Author: emma peel Date: Thu Aug 16 09:29:33 2018 + add torbutton-onboarding strings --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 7c2fed6..d4f50a6 100644 --- a/config +++ b/config @@ -31,6 +31,7 @@ torbutton-torbuttondtd torbutton-torbuttondtd_completed torbutton-aboutdialogdtd torbutton-aboutdialogdtd_completed torbutton-abouttorproperties torbutton-abouttorproperties_completed torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed +torbutton-browseronboarding torbutton-browseronboarding_completed torcheck torcheck_completed tor-launcher-properties tor-launcher-properties_completed tor-launcher-network-settings tor-launcher-network-settings_completed ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit ade1d7591295ebca33d3b68302e0600517b2a284 Author: Translation commit bot Date: Thu Aug 16 09:15:10 2018 + Update translations for abouttor-homepage_completed --- bn_BD/aboutTor.dtd | 42 +++--- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/bn_BD/aboutTor.dtd b/bn_BD/aboutTor.dtd index f9226bf1a..dffca8a84 100644 --- a/bn_BD/aboutTor.dtd +++ b/bn_BD/aboutTor.dtd @@ -1,45 +1,25 @@ - - - - - - - - - + + - + https://duckduckgo.com";> - - - - - - - -https://www.torproject.org/download/download.html.en#warning";> + + + - - - - -https://www.torproject.org/docs/tor-doc-relay.html.en";> - -https://www.torproject.org/getinvolved/volunteer.html.en";> - -https://www.torproject.org/donate/donate.html.en";> + - - -https://www.torproject.org/about/overview.html.en";> + + +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] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit d239daf6610a4ea3e151b59c4f21cb9d4130 Author: Translation commit bot Date: Thu Aug 16 09:15:03 2018 + Update translations for abouttor-homepage --- bn_BD/aboutTor.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bn_BD/aboutTor.dtd b/bn_BD/aboutTor.dtd index df63b5922..dffca8a84 100644 --- a/bn_BD/aboutTor.dtd +++ b/bn_BD/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - + - - + + 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] [translation/browseronboardingproperties_completed] config mistakes
commit cfa308d1623de60eec1eb9694c3911b90e2b2a3b Author: Translation commit bot Date: Thu Aug 16 09:01:08 2018 + config mistakes --- browserOnboarding.properties => en/browserOnboarding.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/browserOnboarding.properties b/en/browserOnboarding.properties similarity index 100% rename from browserOnboarding.properties rename to en/browserOnboarding.properties ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/browseronboardingproperties] config mistakes
commit 0f34f867bd0bad572de466ecaed6e6d0060893a9 Author: Translation commit bot Date: Thu Aug 16 08:57:57 2018 + config mistakes --- .tx/config | 2 +- browserOnboarding.properties => en/browserOnboarding.properties | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.tx/config b/.tx/config index 0d18c127b..13e8d37cf 100644 --- a/.tx/config +++ b/.tx/config @@ -1,6 +1,6 @@ [torproject.browseronboardingproperties] file_filter = /browserOnboarding.properties -source_file = browserOnboarding.properties +source_file = en/browserOnboarding.properties source_lang = en [main] diff --git a/browserOnboarding.properties b/en/browserOnboarding.properties similarity index 100% rename from browserOnboarding.properties rename to en/browserOnboarding.properties ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/browseronboardingproperties_completed] pulling translations from transifex
commit c3296cb8c6d8edb50ab2d29d386777dc5fd93bed Author: Translation commit bot Date: Thu Aug 16 08:50:32 2018 + pulling translations from transifex --- browserOnboarding.properties | 38 ++ 1 file changed, 38 insertions(+) diff --git a/browserOnboarding.properties b/browserOnboarding.properties new file mode 100644 index 0..362eefead --- /dev/null +++ b/browserOnboarding.properties @@ -0,0 +1,38 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=Welcome +onboarding.tour-tor-welcome.title=Youâre ready. +onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding. +onboarding.tour-tor-welcome.button=Start Now + +onboarding.tour-tor-privacy=Privacy +onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canât follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click âTor Networkâ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.button=Go to Tor Network + +onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâs no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on âCircuit Displayâ to learn how they work. +onboarding.tour-tor-network.button=Go to Circuit Display + +onboarding.tour-tor-circuit-display=Circuit Display +onboarding.tour-tor-circuit-display.title=See your path. +onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking âNew Circuit for this Siteâ on our Circuit Display. Click below to see how it works. +onboarding.tour-tor-circuit-display.button=Explore + +onboarding.tour-tor-security=Security +onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do. +onboarding.tour-tor-security.button=Review Settings + +onboarding.tour-tor-expect-differences=Experience Tips +onboarding.tour-tor-expect-differences.title=Experience Tips +onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users. +onboarding.tour-tor-expect-differences.button=See FAQs + +onboarding.tour-tor-onion-services=Onion Services +onboarding.tour-tor-onion-services.title=Onion Services +onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work. +onboarding.tour-tor-
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit ab3ffe69eaeb1b3a0ef735ed24ca2f5935a8b103 Author: Translation commit bot Date: Thu Aug 16 08:45:17 2018 + Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index fe5031ed5..5939f2d36 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-08-06 17:13+\n" +"PO-Revision-Date: 2018-08-16 08:42+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "áá á" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "áá áªáá áá" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -151,7 +151,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sá%sááá®!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -163,7 +163,7 @@ msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[áá¡ ááá¢áááá¢á£á á á¬áá áááá; ááá®ááá áᣠáááááá®ááá£á áááá.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -174,7 +174,7 @@ msgstr "" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "áá¥ááá áááááááá ááá áá¦áá á£á á¡áá®á¨áá áá¡. ááá®ááá, ááááááááááá á¡áªáááá! ááá¤áá¡á¢áá¡ áááááááá á¨áááá«ááááá %s á¡ááááá¡ á¨ááááá. á§áááá á¬áá ááá áá á¨á£áááááá¡ ááááááááááá¨á, á£áá£áááááá§áá¤ááá áá¥áááá." #: bridgedb/strings.py:50 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/master] Initial import for browseronboardingproperties
commit 5c78c1c13e38d1b713d5d145b3596a088ab63f97 Author: emma peel Date: Thu Aug 16 08:26:19 2018 + Initial import for browseronboardingproperties --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0..53867e967 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.tx ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Release preparations for 2.0.2:
commit 8a146c9644ffeff3d283b1643066f920946b91aa Author: Georg Koppen Date: Thu Aug 16 08:16:31 2018 + Release preparations for 2.0.2: Version bump and CHANGELOG update --- src/CHANGELOG | 12 src/install.rdf | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index f1cd4cd1..ce4354bd 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,15 @@ +2.0.2 + * Bug 26960: Implement new about:tor start page + * Bug 26961: Implement new user onboarding + * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus + * Bug 26590: Use new svg.disabled pref in security slider + * Bug 26655: Adjust color and size of onion button + * Bug 26500: Reposition circuit display relay icon for RTL locales + * Bug 26409: Remove spoofed locale implementation + * Bug 26189: Remove content-policy.js + * Bug 27129: Add locales ca, ga, id, is, nb + * Translations update + 2.0.1 * Bug 26100: Adapt Torbutton to Firefox 60 ESR * Bug 26430: New Torbutton icon diff --git a/src/install.rdf b/src/install.rdf index 233fe1f4..8a085cbc 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ Torbutton Mike Perry torbut...@torproject.org -2.0.1 +2.0.2 true https://www.torproject.org/projects/torbrowser.html.en chrome://torbutton/content/preferences.xul ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 27152: Use mozilla/fxc2.git for the fxc2 repository
commit 8a863c42d0ce0a697aaca52cc97603cf6327754e
Author: Sukhbir Singh
Date: Wed Aug 15 10:49:37 2018 -0400
Bug 27152: Use mozilla/fxc2.git for the fxc2 repository
---
projects/fxc2/config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/fxc2/config b/projects/fxc2/config
index aac9158..5cdf03a 100644
--- a/projects/fxc2/config
+++ b/projects/fxc2/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
-git_url: https://github.com/azadi/fxc2.git
-git_hash: 079f5c7b9f6ea0b7e5504bb53abf8709cc92835d
+git_url: https://github.com/mozilla/fxc2.git
+git_hash: 0b800f3e41ed087df6f51f120165f3ccc71cc27c
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[%
c("var/build_id") %].tar.gz'
var:
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Release preparations
commit a1d503be42ce915ee2f6eb2ca8ef7508a1a2c047 Author: Georg Koppen Date: Thu Aug 16 07:47:28 2018 + Release preparations Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 5a31473..e7d7cc9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ The Tor Project, Inc. Pearl Crescent, LLC tor-launc...@torproject.org -0.2.16.1 +0.2.16.2 true https://www.torproject.org/projects/torbrowser.html data:text/plain, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/master] Fixes for reverse DNS resolver
commit 4b05f840fc19d81d5e05f8b0b89c80473024f07a
Author: Iain R. Learmonth
Date: Tue Aug 14 12:51:40 2018 +0100
Fixes for reverse DNS resolver
* SortedSets are used in place of Lists to ensure deterministic
ordering of looked up names
* The NodeStatus serialization is extended to include verified
and unverified host names
* The existing host name field in NodeStatus serializations is
removed and a placeholder inserted
* The last reverse DNS lookup time is now only updated on successful
lookups
* The host name field is removed from summary and details documents
* Tests are updated to use SortedSets in place of Lists
Fixes: #27050
---
.../torproject/onionoo/docs/DetailsDocument.java | 21 +-
.../org/torproject/onionoo/docs/DetailsStatus.java | 16
.../org/torproject/onionoo/docs/DocumentStore.java | 7 ++--
.../org/torproject/onionoo/docs/NodeStatus.java| 47 --
.../torproject/onionoo/docs/SummaryDocument.java | 17
.../org/torproject/onionoo/server/NodeIndexer.java | 9 ++---
.../torproject/onionoo/server/ResponseBuilder.java | 2 -
.../onionoo/updater/NodeDetailsStatusUpdater.java | 33 ---
.../onionoo/updater/RdnsLookupRequest.java | 24 ---
.../onionoo/updater/RdnsLookupWorker.java | 13 ++
.../onionoo/updater/ReverseDomainNameResolver.java | 19 +++--
.../onionoo/writer/DetailsDocumentWriter.java | 1 -
.../onionoo/writer/SummaryDocumentWriter.java | 8 ++--
.../onionoo/docs/SummaryDocumentTest.java | 2 +-
.../onionoo/server/ResourceServletTest.java| 19 +
.../server/SummaryDocumentComparatorTest.java | 2 +-
16 files changed, 98 insertions(+), 142 deletions(-)
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index 650ba5b..5e53d4c 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
+import java.util.TreeSet;
public class DetailsDocument extends Document {
@@ -260,19 +261,19 @@ public class DetailsDocument extends Document {
return unescapeJson(this.hostName);
}
- private List verifiedHostNames;
+ private SortedSet verifiedHostNames;
/**
* Creates a copy of the list with each string escaped for JSON compatibility
* and sets this as the verified host names, unless the argument was null in
* which case the verified host names are just set to null.
*/
- public void setVerifiedHostNames(List verifiedHostNames) {
+ public void setVerifiedHostNames(SortedSet verifiedHostNames) {
if (null == verifiedHostNames) {
this.verifiedHostNames = null;
return;
}
-this.verifiedHostNames = new ArrayList<>();
+this.verifiedHostNames = new TreeSet<>();
for (String hostName : verifiedHostNames) {
this.verifiedHostNames.add(escapeJson(hostName));
}
@@ -283,30 +284,30 @@ public class DetailsDocument extends Document {
* compatibility reversed and returns the copy, unless the held reference was
* null in which case null is returned.
*/
- public List getVerifiedHostNames() {
+ public SortedSet getVerifiedHostNames() {
if (null == this.verifiedHostNames) {
return null;
}
-List verifiedHostNames = new ArrayList<>();
+SortedSet verifiedHostNames = new TreeSet<>();
for (String escapedHostName : this.verifiedHostNames) {
verifiedHostNames.add(unescapeJson(escapedHostName));
}
return verifiedHostNames;
}
- private List unverifiedHostNames;
+ private SortedSet unverifiedHostNames;
/**
* Creates a copy of the list with each string escaped for JSON compatibility
* and sets this as the unverified host names, unless the argument was null
in
* which case the unverified host names are just set to null.
*/
- public void setUnverifiedHostNames(List unverifiedHostNames) {
+ public void setUnverifiedHostNames(SortedSet unverifiedHostNames) {
if (null == unverifiedHostNames) {
this.unverifiedHostNames = null;
return;
}
-this.unverifiedHostNames = new ArrayList<>();
+this.unverifiedHostNames = new TreeSet<>();
for (String hostName : unverifiedHostNames) {
this.unverifiedHostNames.add(escapeJson(hostName));
}
@@ -317,11 +318,11 @@ public class DetailsDocument extends Document {
* compatibility reversed and returns the copy, unless the held reference was
* null in which case null is returned.
*/
- public List getUnverifiedHostNames() {
+ public SortedSet getUnverifiedHostNames() {
if (null == this.unverifiedHostNames) {
return null;
}
-List unverifiedHostNames = ne
[tor-commits] [onionoo/master] Adds JavaDoc for NodeStatus class
commit 02f3d0ce5661ee4552b1076b7c6b3bb0fef0353c
Author: Iain R. Learmonth
Date: Tue Aug 14 14:15:03 2018 +0100
Adds JavaDoc for NodeStatus class
---
.../org/torproject/onionoo/docs/NodeStatus.java| 63 +-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index b2b6c8e..c0c6adf 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -23,6 +23,58 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
+/**
+ * NodeStatus documents contain persistent state for data about relays. These
+ * are read by the hourly updater and then updated with new details where there
+ * are relevant descriptors, consensuses or other documents available.
+ *
+ * At the end of each run of the hourly updater, these documents are
+ * concatenated and written to a single file in status/summary.
+ * Each line contains a single document.
+ *
+ * A new NodeStatus can be created from a string using the
+ * {@link #fromString(String)} static method. To create a serialization, the
+ * {@link #toString()} method can be used.
+ *
+ * The lines are formed of tab-separated values. There must be at least
+ * 23 fields present in the document. Additional fields may be present but
+ * are not required for the document to be valid. A summary of the encoding
+ * can be found here:
+ *
+ *
+ * "r" or "b" to represent a relay or a bridge
+ * Nickname
+ * ASCII representation of hex-encoded fingerprint
+ * OR Addresses
+ * Last seen (date portion)
+ * Last seen (time portion)
+ * OR Port
+ * Dir Port
+ * Relay Flags
+ * Consensus Weight
+ * Country Code
+ * Blank field (previously used for host name)
+ * Last reverse DNS lookup time (milliseconds)
+ * Default policy
+ * Port list
+ * First seen (date portion)
+ * First seen (time portion)
+ * Last address change (date portion)
+ * Last address change (time portion)
+ * AS Number
+ * Contact
+ * Recommended version (boolean)
+ * Family
+ * Version
+ * Blank field (previously used for host name)
+ * Version status
+ * AS Name
+ * Verified and unverified host names
+ *
+ *
+ * This list only provides a summary, individual fields can have
+ * complex encodings with nested lists.
+ */
public class NodeStatus extends Document {
private static final Logger log = LoggerFactory.getLogger(
@@ -489,7 +541,14 @@ public class NodeStatus extends Document {
}
/** Instantiates a new node status object from the given string that may
- * have been produced by {@link #toString()}. */
+ * have been produced by {@link #toString()}. A document that has been
+ * written by a previous version of Onionoo that did not include all the
+ * currently supported fields will still be accepted, but will contain
+ * the new fields if serialized again using {@link #toString()}. A
+ * document that has been generated by a newer version of Onionoo that
+ * contains new fields will be accepted, but those new fields will be
+ * ignored and the data discarded if serialized again using
+ * {@link #toString()}. */
public static NodeStatus fromString(String documentString) {
try {
String[] parts = documentString.trim().split("\t");
@@ -648,6 +707,8 @@ public class NodeStatus extends Document {
}
}
+ /** Generates a String serialization of the node status object that could
+ * be used by {@link #fromString(String)} to recreate this object. */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/master] Adds changelog entry for #27050 changes
commit 2df25c2b5faf5574439dd1c1e4ca56200dd30f31 Author: Iain R. Learmonth Date: Wed Aug 15 23:42:00 2018 +0100 Adds changelog entry for #27050 changes --- CHANGELOG.md | 10 ++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6a28c4..b394a9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Changes in version 6.2-1.17.0 - -??-?? + + * Medium changes + - The "host_name" field will no longer appear in details documents. + - Names in the "verified_host_names" and "unverified_host_names" fields + are written in a deterministic order. + - If a reverse domain name lookup results in either no names being found + or an error then the lookup will be repeated at the next updater run. + + # Changes in version 6.2-1.16.1 - 2018-08-13 * Medium changes ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
