May 2019 - tor-commits - lists.torproject.org

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 14 May '19

14 May '19

commit 135a8ea877cda5e13eabb5bf964081d805d4fbcd Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 12:50:35 2019 +0000 Update translations for tpo-web --- contents+ka.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 4011e666a..e4e9fad05 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -664,7 +664,7 @@ msgid "" "If you find a relay that you think is malicious, misconfigured, or otherwise" " broken, please check out our wiki page and blog post on how to report it." msgstr "" -"თუ აღმოაჩინეთ გადამცემი, რომელიც თქვენი აზრით მავნე, გაუმართავი ან რამე " +"თუ აღმოაჩინეთ გადამცემი, რომელიც თქვენი აზრით მავნეა, გაუმართავია ან რამე " "სხვაგვარი ხარვეზის მქონეა, გთხოვთ გადახედოთ ჩვენს ვიკის ან სვეტს და იხილოთ, " "როგორ ხდება მოხსენების გამოგზავნა." @@ -706,7 +706,7 @@ msgstr "" #: templates/contact.html:104 msgid "Send us Mail" -msgstr "მოგვწერეთ ფოსტაზე" +msgstr "მოგვწერეთ ფოსტით" #: templates/download-android.html:12 msgid "Get Tor Browser for Android." @@ -1018,7 +1018,7 @@ msgstr "" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings" -msgstr "ადრინდელი თავისუფალი თანამდებობები " +msgstr "ადრე გამოცხადებული" #: templates/jobs.html:32 templates/projects.html:33 msgid "" @@ -1104,11 +1104,11 @@ msgstr "Onion-მომსახურებები" #: templates/press.html:40 msgid "Press Releases" -msgstr "პრესაში გამოცემული განცხადება" +msgstr "გამოქვეყნებული განცხადებები" #: templates/press.html:54 msgid "Coverage" -msgstr "დაფარვის არე" +msgstr "გაშუქებული ამბები" #: templates/press.html:61 msgid "Date"

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 14 May '19

14 May '19

commit 4440bee2141253e9bf2c5686464e4775c208790a Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 12:45:53 2019 +0000 Update translations for exoneratorproperties_completed --- ka/exonerator.properties | 7 +++---- tr/exonerator.properties | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ka/exonerator.properties b/ka/exonerator.properties index e2eb09260..0b303b839 100644 --- a/ka/exonerator.properties +++ b/ka/exonerator.properties @@ -43,10 +43,9 @@ technicaldetails.exit.yes=áááá® technicaldetails.exit.no=áá á permanentlink.heading=áá£ááááá ááá£áá footer.abouttor.heading=Tor-áá¡ ášáá¡áá®áá -footer.abouttor.body.text=Tor á¬áá áááááááá¡ á¡ááá ááášáá áá¡á áá ááá ááá£á áá ááá¥á¢á¡, ááá¢áá ááá¢ášá áááááªáááááá¡ áááááááá¡ ááá£áá®áááá áááááªáááá¡áááá¡ %s.  ááá áááá, áá£ á®ááááá áááááªááááá¡ áááááá¡ Tor-ááááááªáááááá, áá¡ á©ááá£áááá áá ááášáááá¡, á áá ááŠááášáá£áá áááááªááááá ááááá¡ Tor-áá¡ áááá®ááá ááááá¡ááá áá áá á ááááá ááááááªáááá¡ áá€ááááááá¡ááá.  Tor-áá ááá¥á¢á áá Tor-ááááááªáááá¡ áá€áááááááá áá ááááá á©áááá¬áá ááá¡ áá áááá®áááá á¥á¡ááášá ááá¢áá ááá £áá áááááªáááááá¡ ášáá¡áá®áá áá ášáá¡áááááá¡áá, ááá ááááá á ááá€áá áááªááá¡ ááá¬áááááá¡ ááá ášáá«ááááá, áááá á¬áá áááááááááá¡ ááááááá.  áá®áááá %s áá áá ááááá áááá %s ááááá¢ááááá ááá€áá áááªááá¡áááá¡. -footer.abouttor.body.link1=ááááá¢áááá¡ ááášáá€áá ááá áá áááá ááá¢áá áááá á¥á¡áááá¡ ááááá«áááá¡ áá¬áá ááá¡ ášáá áá¡, á¡áááá ááááŠá¬ááá¡ ááááášáá£ááááá¡ á¡áááááá á¬áá á¢áááááá -footer.abouttor.body.link2=áá áªááá Tor-áá¡ ášáá¡áá®áá -footer.abouttor.body.link3=ááá£áááášáá ááá Tor Project, Inc-á¡ +footer.abouttor.body.text=Tor á¬áá áááááááá¡ á¡ááá ááášáá áá¡á áá ááá ááá£á áá ááá¥á¢á¡, ááá¢áá ááá¢ášá ááá€áá áááªááá¡ áááááááá¡ ááá£áááŠáááááááá áááááªáááá¡áááá¡, áááááªáááááá¡ ááášáá€áá ááá áá ááááááááááá á¡á®ááááá¡á®áá ááááá«áá¡ áááááá.  ááá áááá, áá£ á®ááááá áááááªááááá¡ áááááá¡ Tor-ááááááªáááááá, áá¡ á©ááá£áááá áá ááášáááá¡, á áá ááŠááášáá£áá áááááªááááá ááááá¡ Tor-áá¡ áááá®ááá ááááá¡ááá áá áá á ááááá ááááááªáááá¡ áá€ááááááá¡ááá.  Tor-áá ááá¥á¢á áá T or-ááááááªáááá¡ áá€áááááááá áá ááááá á©áááá¬áá ááá¡ áá áááá®áááá á¥á¡ááášá ááá¢áá ááá£áá áááááªáááááá¡ ášáá¡áá®áá áá ášáá¡áááááá¡áá, ááá ááááá á ááá€áá áááªááá¡ ááá¬áááááá¡ ááá ášáá«ááááá, áááá á¬áá áááááááááá¡ ááááááá.  áá®áááá %s áá áá ááááá áááá %s ááááá¢ááááá ááá€áá áááªááá¡áááá¡. +footer.abouttor.body.link1=áá áªááá Tor-áá¡ ášáá¡áá®áá +footer.abouttor.body.link2=ááá£áááášáá ááá Tor Project, Inc-á¡ footer.aboutexonerator.heading=ExoneraTor-áá¡ ášáá¡áá®áá footer.aboutexonerator.body=áááá¡áá®á£á ááá ExoneraTor á£áá á£ááááá§áá€á¡ áááááªáááá ááááá¡ IP-ááá¡áááá ááááá¡, á áááááááª ááááá§ááááá£ááá Tor-á¥á¡ááášá.  ááá¡á£á®ááá¡ áááá®áááá, áá£ášááááá áá£ áá á Tor-ááááááªááá áááªááá£áá IP-ááá¡áááá ááá áááªááá£á ááá ááŠáá.  ExoneraTor ášáá¡áá«ááá áááá®ááááá¡ áá ááá ááá¢ IP-ááá¡áááá áá¡ áááááá£á ááááááªáááá, áá£ áá¡ ááááááªááá áá§áááááá á¡á®ááááá¡á®áá IP-ááá¡áááá áá¡ ááá¢áá ááá¢ášá ááá¡áá¡áááááá áá Tor-á¥á¡ááášá á áááá¡á¢á ááªááá¡áá¡, áááá¡ááá ááá áááá®ááá¡ ááá€áá áááªááá¡ áááá¡ ááááááá, á°á¥áááá áá£ áá á ááááááªááá¡ Tor-ášá áááááªááááá ááá€áá áááªááá¡, áŠáá ááá¢áá ááá¢ášá áááááªáááá¡ ááááá ááá, ááŠááášáá£áá áá ááá¡áááá¡. footer.language.name=áááááá¡á£á á diff --git a/tr/exonerator.properties b/tr/exonerator.properties index 26e428d66..0e0a2fc51 100644 --- a/tr/exonerator.properties +++ b/tr/exonerator.properties @@ -43,10 +43,9 @@ technicaldetails.exit.yes=Evet technicaldetails.exit.no=HayÄ±r permanentlink.heading=KalÄ±cÄ± baÄlantÄ± footer.abouttor.heading=Tor HakkÄ±nda -footer.abouttor.body.text=Tor %s tarafÄ±ndan Ä°nternet trafiÄini anonimleÅtirmek amacÄ±yla geliÅtirilmiÅ uluslararasÄ± bir yazÄ±lÄ±mdÄ±r. Bu nedenle bir Tor aktarÄ±cÄ±sÄ±ndan gelen bir trafik gÃ¶rÃŒrseniz, bu trafik aktarÄ±cÄ± hizmet saÄlayÄ±cÄ±sÄ±na deÄil aktarÄ±cÄ±yÄ± kullanan bir Tor kullanÄ±cÄ±sÄ±na aittir. Tor projesi ve Tor aktarÄ±cÄ± hizmeti saÄlayanlar aÄ ÃŒzerine geÃ§en trafiÄi kaydetmez ve kaynaÄÄ± hakkÄ±nda bilgi vermez. %s olduÄundan emin olun ve ayrÄ±ntÄ±lÄ± bilgi almak iÃ§in %s ile gÃ¶rÃŒÅmekten Ã§ekinmeyin. -footer.abouttor.body.link1=paketler hedefe ulaÅtÄ±rÄ±lmadan Ã¶nce Åifrelenir ve farklÄ± duraklardan geÃ§irilir. -footer.abouttor.body.link2=Tor hakkÄ±nda ayrÄ±ntÄ±lÄ± bilgi alÄ±n -footer.abouttor.body.link3=Tor Project, Inc. ile gÃ¶rÃŒÅÃŒn +footer.abouttor.body.text=Tor, veri paketlerini Åifreleyerek ve bir dizi duraktan geÃ§irerek Ä°nternet trafiÄini anonimleÅtiren uluslararasÄ± bir yazÄ±lÄ±m projesidir. Bu nedenle bir Tor aktarÄ±cÄ±sÄ±ndan gelen bir trafik gÃ¶rÃŒrseniz, bu trafik aktarÄ±cÄ± iÅletmecisine deÄil, aktarÄ±cÄ±yÄ± kullanan bir Tor kullanÄ±cÄ±sÄ±na aittir. Tor projesi ve Tor aktarÄ±cÄ± iÅletmecileri, aÄ ÃŒzerinden geÃ§en trafik ile ilgili bir kayÄ±t tutmadÄ±ÄÄ±ndan trafiÄin kaynaÄÄ± hakkÄ±nda da kimseye bilgi veremez. %s olduÄundan emin olun ve ayrÄ±ntÄ±lÄ± bilgi almak iÃ§in %s ile gÃ¶rÃŒÅmekten Ã§ekinmeyin. +footer.abouttor.body.link1=Tor hakkÄ±nda ayrÄ±ntÄ±lÄ± bilgi alÄ±n +footer.abouttor.body.link2=Tor Project, Inc. ile gÃ¶rÃŒÅÃŒn footer.aboutexonerator.heading=ExoneraTor HakkÄ±nda footer.aboutexonerator.body=ExoneraTor hizmeti Tor aÄÄ±nda bulunan IP adreslerinin veri tabanÄ±nÄ± tutar. SorulduÄunda, belirli bir tarihte belirli bir IP adresinin Tor aktarÄ±cÄ±sÄ± olarak Ã§alÄ±ÅÄ±p Ã§alÄ±ÅmadÄ±ÄÄ±nÄ± bildirir. AktarÄ±cÄ± Tor aÄÄ±na kayÄ±t olurken Ä°nternet baÄlantÄ±sÄ± iÃ§in farklÄ± IP adresleri kullanÄ±yorsa ExoneraTor ÃŒzerinde birden fazla IP adresi kayÄ±t edilebilir. AyrÄ±ca bir aktarÄ±cÄ±nÄ±n belirtilen zamanda Tor trafiÄini Ä°nternet ÃŒzerine aktarmaya aÃ§Ä±k olup olmadÄ±ÄÄ± da kaydedilir. footer.language.name=Ä°ngilizce

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 14 May '19

14 May '19

commit 2a15b019d55a7d753f6af35508858f2fb9735852 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 12:45:46 2019 +0000 Update translations for exoneratorproperties --- ka/exonerator.properties | 2 +- tr/exonerator.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/exonerator.properties b/ka/exonerator.properties index f7d74462d..0b303b839 100644 --- a/ka/exonerator.properties +++ b/ka/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=დიახ technicaldetails.exit.no=არა permanentlink.heading=მუდმივი ბმული footer.abouttor.heading=Tor-ის შესახებ -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  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.text=Tor წარმოადგენს საერთაშორისო პროგრამულ პროექტს, ინტერნეტში ინფორმაციის ვინაობის გაუმჟღავნებლად მიმოცვლისთვის, მონაცემების დაშიფვრითა და გადაგზავნით სხვადასხვა კვანძის გავლით.  ამრიგად, თუ ხედავთ მონაცემებს ნაკადს Tor-გადამცემიდან, ეს ჩვეულებრივ ნიშნავს, რომ აღნიშნული მონაცემები მოდის Tor-ის მომხმარებლისგან და არა თავად გადამცემის მფლობელისგან.  Tor-პროექტი და T or-გადამცემის მფლობელები არანაირ ჩანაწერებს არ ინახავენ ქსელში გატარებული მონაცემების შესახებ და შესაბამისად, ვერანაირი ინფორმაციის მოწოდებას ვერ შეძლებენ, მათი წარმომავლობის თაობაზე.  იხილეთ %s და არ მოგერიდოთ %s დამატებითი ინფორმაციისთვის. footer.abouttor.body.link1=ვრცლად Tor-ის შესახებ footer.abouttor.body.link2=დაუკავშირდეთ Tor Project, Inc-ს footer.aboutexonerator.heading=ExoneraTor-ის შესახებ diff --git a/tr/exonerator.properties b/tr/exonerator.properties index 709993b4a..0e0a2fc51 100644 --- a/tr/exonerator.properties +++ b/tr/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=Evet technicaldetails.exit.no=Hayır permanentlink.heading=Kalıcı bağlantı footer.abouttor.heading=Tor Hakkında -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  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.text=Tor, veri paketlerini şifreleyerek ve bir dizi duraktan geçirerek İnternet trafiğini anonimleştiren uluslararası bir yazılım projesidir. Bu nedenle bir Tor aktarıcısından gelen bir trafik görürseniz, bu trafik aktarıcı işletmecisine değil, aktarıcıyı kullanan bir Tor kullanıcısına aittir. Tor projesi ve Tor aktarıcı işletmecileri, ağ üzerinden geçen trafik ile ilgili bir kayıt tutmadığından trafiğin kaynağı hakkında da kimseye bilgi veremez. %s olduğundan emin olun ve ayrıntılı bilgi almak için %s ile görüşmekten çekinmeyin. footer.abouttor.body.link1=Tor hakkında ayrıntılı bilgi alın footer.abouttor.body.link2=Tor Project, Inc. ile görüşün footer.aboutexonerator.heading=ExoneraTor Hakkında

1 0

[tor/master] Merge branch 'tor-github/pr/1006'
by asn＠torproject.org 14 May '19

14 May '19

commit 0f4f4fdcf56b88cd36bc94e8a45ccd9c5dce3a60 Merge: 5d950f3ed 07e4b09b5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 14 15:15:09 2019 +0300 Merge branch 'tor-github/pr/1006' src/core/or/protover.c | 6 ++++-- src/core/or/protover.h | 1 + src/rust/protover/ffi.rs | 1 + src/rust/protover/protover.rs | 8 ++++++-- 4 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/master] sendme: Add FlowCtrl protover value
by asn＠torproject.org 14 May '19

14 May '19

commit 07e4b09b5f27326a1aa58b5b2ed3c25ceb5a6db6 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri May 3 13:24:06 2019 -0400 sendme: Add FlowCtrl protover value See proposal 289 section 4.3 for more details. It describes the flow control protocol at the circuit and stream level. If there is no FlowCtrl protocol version, tor supports the unauthenticated flow control features from its supported Relay protocols. At this commit, relay will start advertising FlowCtrl=1 meaning they support authenticated SENDMEs v1. Closes #30363 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/protover.c | 6 ++++-- src/core/or/protover.h | 1 + src/rust/protover/ffi.rs | 1 + src/rust/protover/protover.rs | 8 ++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 1edf78ec8..e12919f0a 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -53,7 +53,8 @@ static const struct { { PRT_DESC, "Desc" }, { PRT_MICRODESC, "Microdesc"}, { PRT_PADDING, "Padding"}, - { PRT_CONS, "Cons" } + { PRT_CONS, "Cons" }, + { PRT_FLOWCTRL, "FlowCtrl"}, }; #define N_PROTOCOL_NAMES ARRAY_LENGTH(PROTOCOL_NAMES) @@ -401,7 +402,8 @@ protover_get_supported_protocols(void) #endif "Microdesc=1-2 " "Relay=1-2 " - "Padding=1"; + "Padding=1 " + "FlowCtrl=1"; } /** The protocols from protover_get_supported_protocols(), as parsed into a diff --git a/src/core/or/protover.h b/src/core/or/protover.h index 567b94a16..d8e541735 100644 --- a/src/core/or/protover.h +++ b/src/core/or/protover.h @@ -44,6 +44,7 @@ typedef enum protocol_type_t { PRT_MICRODESC = 8, PRT_CONS = 9, PRT_PADDING = 10, + PRT_FLOWCTRL = 11, } protocol_type_t; bool protover_contains_long_protocol_names(const char *s); diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 066b08edd..14170d035 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -31,6 +31,7 @@ fn translate_to_rust(c_proto: uint32_t) -> Result<Protocol, ProtoverError> { 8 => Ok(Protocol::Microdesc), 9 => Ok(Protocol::Cons), 10 => Ok(Protocol::Padding), + 11 => Ok(Protocol::FlowCtrl), _ => Err(ProtoverError::UnknownProtocol), } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 74158d9f6..f7d9d6d15 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -47,6 +47,7 @@ pub enum Protocol { Microdesc, Relay, Padding, + FlowCtrl, } impl fmt::Display for Protocol { @@ -75,6 +76,7 @@ impl FromStr for Protocol { "Microdesc" => Ok(Protocol::Microdesc), "Relay" => Ok(Protocol::Relay), "Padding" => Ok(Protocol::Padding), + "FlowCtrl" => Ok(Protocol::FlowCtrl), _ => Err(ProtoverError::UnknownProtocol), } } @@ -166,7 +168,8 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { LinkAuth=3 \ Microdesc=1-2 \ Relay=1-2 \ - Padding=1" + Padding=1 \ + FlowCtrl=1" ) } else { cstr!( @@ -180,7 +183,8 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { LinkAuth=1,3 \ Microdesc=1-2 \ Relay=1-2 \ - Padding=1" + Padding=1 \ + FlowCtrl=1" ) } }

1 0

[tor-android-service/master] Bug 30166: If custom bridges are specified, only use those bridges for connecting
by gk＠torproject.org 14 May '19

14 May '19

commit de62a5af6026a9caa6448eaac4e0bc9709a20817 Author: sisbell <shane.isbell(a)gmail.com> Date: Sat Apr 20 19:46:21 2019 -0700 Bug 30166: If custom bridges are specified, only use those bridges for connecting --- .../android/service/CustomTorInstaller.java | 20 +++++++- .../org/torproject/android/service/TorService.java | 60 ++++++++++++---------- .../org/torproject/android/service/util/Prefs.java | 7 ++- 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java index 6b5a1b8..e962137 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -32,10 +32,26 @@ public class CustomTorInstaller extends TorInstaller { updateTorConfigCustom(torrcFile, content); } + /** + * Opens bridges list as <code>InputStream</code>. First checks for user defined bridges from the user pref file. + * If it finds user defined bridges, then the stream will contain only these bridges. Otherwise, it returns + * a set of predefined bridges. + */ @Override public InputStream openBridgesStream() throws IOException { - ByteArrayInputStream userDefinedBridges = new ByteArrayInputStream((Prefs.getBridgesList() + "\r\n").getBytes()); - return new SequenceInputStream(userDefinedBridges, context.getResources().getAssets().open("common/bridges.txt")); + /* + BridgesList is an overloaded field, which can cause some confusion. The list can be: + 1) a filter like obfs4 or meek OR 2) it can be a custom bridge + For (1), we just pass back all bridges, the filter will occur elsewhere in the library. + For (2) we return the bridge list as a raw stream + If length is greater than 5, then we know this is a custom bridge + */ + String userDefinedBridgeList = Prefs.getBridgesList(); + byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + ByteArrayInputStream bridgeTypeStream = new ByteArrayInputStream(new byte[]{bridgeType}); + InputStream bridgeStream = (bridgeType == 1) ? new ByteArrayInputStream((userDefinedBridgeList + "\r\n").getBytes()) + : context.getResources().getAssets().open("common/bridges.txt"); + return new SequenceInputStream(bridgeTypeStream, bridgeStream); } private static void copy(InputStream is, File target) throws IOException { diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index a748241..dea4bd2 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -290,37 +290,12 @@ public final class TorService extends Service implements TorServiceConstants, Or private boolean setupTor() { try { onionProxyManager.setup(); + return true; } catch (Exception e) { Log.e(OrbotConstants.TAG, "Error installing Tor binaries", e); mEventBroadcaster.broadcastNotice("There was an error installing Tor binaries"); return false; } - - try { - mEventBroadcaster.broadcastNotice(getString(R.string - .updating_settings_in_tor_service)); - TorConfigBuilder builder = onionProxyManager.getContext() - .newConfigBuilder().updateTorConfig(); - - File nativeDir = new File(getApplicationInfo().nativeLibraryDir); - File pluggableTransport = new File(nativeDir, "libObfs4proxy.so"); - if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true); - - builder.configurePluggableTransportsFromSettings(pluggableTransport); - mDataService.updateConfigBuilder(builder); - onionProxyManager.getTorInstaller().updateTorConfigCustom - (builder.asString()); - mEventBroadcaster.broadcastNotice("updating torrc custom configuration..."); - mEventBroadcaster.broadcastDebug("torrc.custom=" + builder.asString()); - mEventBroadcaster.broadcastNotice("success."); - } catch (Exception e) { - e.printStackTrace(); - Log.e(OrbotConstants.TAG, e.getMessage()); - mEventBroadcaster.broadcastNotice("Error configuring tor: " + e.toString()); - return false; - } - - return true; } private synchronized void startTor() { @@ -331,6 +306,7 @@ public final class TorService extends Service implements TorServiceConstants, Or setTorNetworkEnabledAsync(true); } else { try { + updateTorrcConfig(); mEventBroadcaster.broadcastNotice("checking binary version: " + TOR_VERSION); mEventBroadcaster.getStatus().starting(); notify(getString(R.string.status_starting_up), NOTIFY_ID, @@ -380,6 +356,38 @@ public final class TorService extends Service implements TorServiceConstants, Or }).start(); } + /** + * Updates the torrc file based on the current user preferences + */ + private boolean updateTorrcConfig() { + try { + mEventBroadcaster.broadcastNotice(getString(R.string + .updating_settings_in_tor_service)); + TorConfigBuilder builder = onionProxyManager.getContext() + .newConfigBuilder().updateTorConfig(); + + //Check bridges to see if we need this + File nativeDir = new File(getApplicationInfo().nativeLibraryDir); + File pluggableTransport = new File(nativeDir, "libObfs4proxy.so"); + if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true); + + builder.configurePluggableTransportsFromSettings(pluggableTransport); + mDataService.updateConfigBuilder(builder); + onionProxyManager.getTorInstaller().updateTorConfigCustom + (builder.asString()); + mEventBroadcaster.broadcastNotice("updating torrc custom configuration..."); + mEventBroadcaster.broadcastDebug("torrc.custom=" + builder.asString()); + mEventBroadcaster.broadcastNotice("success."); + } catch (Exception e) { + e.printStackTrace(); + Log.e(OrbotConstants.TAG, e.getMessage()); + mEventBroadcaster.broadcastNotice("Error configuring tor: " + e.toString()); + return false; + } + + return true; + } + private class ActionBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { if (intent != null || CMD_NEWNYM.equals(intent.getAction())) { diff --git a/service/src/main/java/org/torproject/android/service/util/Prefs.java b/service/src/main/java/org/torproject/android/service/util/Prefs.java index 0a2bf45..6274088 100644 --- a/service/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/service/src/main/java/org/torproject/android/service/util/Prefs.java @@ -52,10 +52,9 @@ public class Prefs { } public static String getBridgesList() { - String defaultBridgeType = "obfs4"; - if (Locale.getDefault().getLanguage().equals("fa")) - defaultBridgeType = "meek"; //if Farsi, use meek as the default bridge type - return prefs.getString(PREF_BRIDGES_LIST, defaultBridgeType); + String defaultBridgeType = (Locale.getDefault().getLanguage().equals("fa")) ? "meek": "obfs4"; + String list = prefs.getString(PREF_BRIDGES_LIST, defaultBridgeType); + return (list.trim().isEmpty()) ? defaultBridgeType : list; } public static void setBridgesList(String value) {

1 0

[tor-android-service/master] Bug 30488: Update TOPL library to Commit e29acfb25f
by gk＠torproject.org 14 May '19

14 May '19

commit 91e841b359a9b71d1225bf798a2c0db123575bfd Author: sisbell <shane.isbell(a)gmail.com> Date: Sun May 12 22:02:03 2019 -0700 Bug 30488: Update TOPL library to Commit e29acfb25f --- service/libs/universal-0.0.3.jar | Bin 43692 -> 45826 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/service/libs/universal-0.0.3.jar b/service/libs/universal-0.0.3.jar index 9eea04f..c28b0d5 100644 Binary files a/service/libs/universal-0.0.3.jar and b/service/libs/universal-0.0.3.jar differ

1 0

[tor-android-service/master] Bug 30483: JCenter Can Cause Mismatched Hashes
by gk＠torproject.org 14 May '19

14 May '19

commit 0bc3add0c73ab25fb29fa4710ebfc80ce09aa2f1 Author: sisbell <shane.isbell(a)gmail.com> Date: Sat Apr 27 13:24:35 2019 -0700 Bug 30483: JCenter Can Cause Mismatched Hashes --- build.gradle | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 178278e..671edab 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +apply plugin: 'maven' buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" @@ -16,12 +17,8 @@ buildscript { allprojects { repositories { google() - jcenter() - maven { url "https://jitpack.io" } + mavenCentral() + maven { url "https://repo.spring.io/plugins-release" } maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +} \ No newline at end of file

1 0

[tor-android-service/master] Bug 30484: Upgrade To Android Plugin 3.4.0 to work with latest IDE and
by gk＠torproject.org 14 May '19

14 May '19

commit c464f6cc0fb78fb99dd01fba3df9843fb929023c Author: sisbell <shane.isbell(a)gmail.com> Date: Sat Apr 27 13:12:02 2019 -0700 Bug 30484: Upgrade To Android Plugin 3.4.0 to work with latest IDE and tools --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 94b7ea6..75f5aba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m kotlin.code.style=official # Configure Android Gradle Plugin Version -androidplugin=3.2.1 +androidplugin=3.4.0 # Build versions appcompatVersion=28.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a4163a..16622c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Apr 27 12:57:35 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 14 May '19

14 May '19

commit c0d5be0d55044727f008b927a6e46163c8a7c46a Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 14 10:15:36 2019 +0000 Update translations for donatepages-messagespot --- locale/ca/LC_MESSAGES/messages.po | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/locale/ca/LC_MESSAGES/messages.po b/locale/ca/LC_MESSAGES/messages.po index df335eebc..287580a9f 100644 --- a/locale/ca/LC_MESSAGES/messages.po +++ b/locale/ca/LC_MESSAGES/messages.po @@ -8,10 +8,11 @@ # Marc Ripoll <markripesp(a)gmail.com>, 2018 # josep constantí mata <iceberg.jcm(a)gmail.com>, 2019 # Fito JB, 2019 +# Sandra Monferrer <smonferrer(a)gmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Fito JB, 2019\n" +"Last-Translator: Sandra Monferrer <smonferrer(a)gmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -21,7 +22,7 @@ msgstr "" #: tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:35 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:35 msgid "Support the Tor Project Today!" -msgstr "" +msgstr "Dona suport avui al Projecte Tor!" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:48 #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:71 @@ -44,6 +45,7 @@ msgstr "Tor: Força en nombres." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:75 msgid "Donate to the Tor Project and protect the privacy of millions." msgstr "" +"Dona al Projecte Tor i protegeix la privacitat de milions de persones." #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:54 #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:77 @@ -58,13 +60,13 @@ msgstr "A l''anonimat li encanta la companyia." #: tmp/cache_locale/eb/eba664d7c34b5e9dc599e5803f583f25e99c16ec96f31536baeeabb9c42131a3.php:40 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:63 msgid "summary_large_image" -msgstr "" +msgstr "summary_large_image" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:67 #: tmp/cache_locale/eb/eba664d7c34b5e9dc599e5803f583f25e99c16ec96f31536baeeabb9c42131a3.php:44 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:67 msgid "@torproject" -msgstr "" +msgstr "@torproject" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:101 msgid "" @@ -74,6 +76,12 @@ msgid "" "steady, reliable source of funds to help us be nimble in an ever-changing " "privacy landscape." msgstr "" +"Necessitem donants mensuals (defensors de la privadesa), que es mantinguin " +"vigilants en la nostra missió de proporcionar eines que protegeixen la " +"privadesa i la identitat en línia de les persones. Els defensors de la " +"privadesa donen una petita quantitat cada mes, creant així una font fiable i" +" estable de fons que en ajudin a estar preparats en un entorn de privadesa " +"en constant canvi. " #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105 msgid "" @@ -82,10 +90,13 @@ msgid "" "your monthly donation now and stand with the Tor Project at this critical " "time." msgstr "" +"Amb la vostra ajuda, farem que la xarxa Tor estigui accessible per a tots. " +"Junts, lluitarem per el dret universal a la privadesa. Feu la vostra donació" +" mensual ara i suporteu el Projecte Tor en aquests moments tan crítics." #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:111 msgid "Want to make a one time donation instead?" -msgstr "" +msgstr "En comptes d'això voleu fer una única donació?" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:118 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102 @@ -94,6 +105,8 @@ msgid "" "This page requires Javascript to do PayPal or credit card\n" " donations, but it appears you have Javascript disabled." msgstr "" +"Aquesta pàgina requereix Javascript per fer donacions per PayPal o amb " +"targeta de crèdit, però sembla que teniu Javascript desactivat." #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:122 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:106 @@ -109,7 +122,7 @@ msgstr "" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:214 msgid "Monthly giving" -msgstr "" +msgstr "Donació mensual" #: tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34 msgid "Processing Donation - Tor" @@ -122,7 +135,7 @@ msgstr "Processant Donació. Esperi..." #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:34 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:34 msgid "Tor Thanks You" -msgstr "" +msgstr "Gràcies en nom de Tor" #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:44 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:44 @@ -132,13 +145,13 @@ msgstr "Moltes gràcies!" #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:51 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:51 msgid "Thank you for supporting Tor's Strength in Numbers campaign." -msgstr "" +msgstr "Gràcies per suportar la campanya Tor: Força en nombres." #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:53 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:53 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:63 msgid "You should receive an email receipt shortly." -msgstr "" +msgstr "Rebreu un rebut per correu electrònic en breu." #: tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:55 #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:55

1 0