[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-10-23 Thread translation
commit 0bcf62d6891cd84a64be3d6e429e2b2f1077e297
Author: Translation commit bot 
Date:   Wed Oct 24 02:48:26 2018 +

Update translations for torbutton-torbuttonproperties
---
 hr/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index 79d3d2e6f..4815c4c69 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -16,7 +16,7 @@ torbutton.panel.label.enabled = Tor omogućen
 extensions.torbut...@torproject.org.description = Torbutton pruža gumb za 
konfiguriranje Tor postavki i brzo i lagano brisanje podataka privatnog 
pregledavanja.
 torbutton.popup.external.title = Preuzmi vanjski tip datoteke?
 torbutton.popup.external.app = Tor Preglednik ne može prikazati ovu datoteku. 
Trebate ju otvoriti sa drugom aplikacijom.\n\n
-torbutton.popup.external.note = Neke vrste fajla ili datoteke mogu da utjecu 
na aplikaciju tako sto se konektiraju na Internet bez koristenja Tora.\n
+torbutton.popup.external.note = Neki tipovi datoteka mogu uzrokovati 
povezivanje aplikacija s internetom bez korištenja Tor-a.\n\n
 torbutton.popup.external.suggest = Da bi ste bili zasticeni, morate otvoriti 
skinute datotake kad ste offline, ili koristite Tor Uzivo DC kao sto je Tails. 
\n
 torbutton.popup.launch = Skini fajl
 torbutton.popup.cancel = Otkazi

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2018-10-23 Thread translation
commit ca570b7721a786e0386ace90b7859061b384bc6c
Author: Translation commit bot 
Date:   Wed Oct 24 02:19:04 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 hr/abouttbupdate.dtd | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/hr/abouttbupdate.dtd b/hr/abouttbupdate.dtd
new file mode 100644
index 0..1a990d58b
--- /dev/null
+++ b/hr/abouttbupdate.dtd
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2018-10-23 Thread translation
commit 5dbc0e97532449510b0d6f100fb186af74f4df8e
Author: Translation commit bot 
Date:   Wed Oct 24 02:18:52 2018 +

Update translations for torbutton-aboutdialogdtd_completed
---
 hr/aboutdialog.dtd | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd
new file mode 100644
index 0..31f083534
--- /dev/null
+++ b/hr/aboutdialog.dtd
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2018-10-23 Thread translation
commit ec1b3a197cbe6286b1a9f28a6a996cf4da500927
Author: Translation commit bot 
Date:   Wed Oct 24 02:18:58 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 hr/abouttbupdate.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hr/abouttbupdate.dtd b/hr/abouttbupdate.dtd
index f7b3f2ed8..1a990d58b 100644
--- a/hr/abouttbupdate.dtd
+++ b/hr/abouttbupdate.dtd
@@ -1,10 +1,10 @@
-
-
-
-
+
+
+
+
 
-
+
 
-
-
-
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2018-10-23 Thread translation
commit 7bfc1ca4b4394fbb401963870af2bbf092fb81d9
Author: Translation commit bot 
Date:   Wed Oct 24 02:18:47 2018 +

Update translations for torbutton-aboutdialogdtd
---
 hr/aboutdialog.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd
index 1285b429e..31f083534 100644
--- a/hr/aboutdialog.dtd
+++ b/hr/aboutdialog.dtd
@@ -1,19 +1,19 @@
 
 
-
-
+
+
 
-
+
 
 
-
+
 
-
+
 
 
 
 
-
+
 
-
-
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-10-23 Thread translation
commit b0cebd7c8e0c45eaaf53b1769c72040895a8757d
Author: Translation commit bot 
Date:   Wed Oct 24 02:18:27 2018 +

Update translations for torbutton-torbuttonproperties
---
 hr/torbutton.properties | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index 41a213022..79d3d2e6f 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -1,21 +1,21 @@
 torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = IP unknown
-torbutton.circuit_display.onion_site = Onion site
-torbutton.circuit_display.this_browser = This browser
-torbutton.circuit_display.relay = Relay
-torbutton.circuit_display.tor_bridge = Bridge
-torbutton.circuit_display.unknown_country = Unknown country
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
-torbutton.circuit_display.learn_more = Nauči više.
-torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
+torbutton.circuit_display.ip_unknown = IP nepoznat
+torbutton.circuit_display.onion_site = Onion stranica
+torbutton.circuit_display.this_browser = Ovaj preglednik
+torbutton.circuit_display.relay = Relej
+torbutton.circuit_display.tor_bridge = Most
+torbutton.circuit_display.unknown_country = Nepoznata zemlja
+torbutton.circuit_display.guard = Čuvar
+torbutton.circuit_display.guard_note = Vaš [Čuvar] čvor se ne bude mijenjao.
+torbutton.circuit_display.learn_more = Saznajte više
+torbutton.content_sizer.margin_tooltip = Tor preglednik dodaje ovu marginu 
kako bi širina i dužina Vašeg preglednika bila manje prepoznatljiva, to će 
otežiti ostalima da vas prate na mreži.
 torbutton.panel.tooltip.disabled = Kliknite da biste omogućili Tor
 torbutton.panel.tooltip.enabled = Kliknite da biste onemogućili Tor
 torbutton.panel.label.disabled = Tor onemogućen
 torbutton.panel.label.enabled = Tor omogućen
-extensions.torbut...@torproject.org.description = Torbutton provides a button 
to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Skinuti spoljasnju ili vanjsku datoteku?
-torbutton.popup.external.app = Tor Pretrazivac ne moze da pokaze ovaj fajl. 
Morate ga otvoriti sa drugom aplikacijom.\n
+extensions.torbut...@torproject.org.description = Torbutton pruža gumb za 
konfiguriranje Tor postavki i brzo i lagano brisanje podataka privatnog 
pregledavanja.
+torbutton.popup.external.title = Preuzmi vanjski tip datoteke?
+torbutton.popup.external.app = Tor Preglednik ne može prikazati ovu datoteku. 
Trebate ju otvoriti sa drugom aplikacijom.\n\n
 torbutton.popup.external.note = Neke vrste fajla ili datoteke mogu da utjecu 
na aplikaciju tako sto se konektiraju na Internet bez koristenja Tora.\n
 torbutton.popup.external.suggest = Da bi ste bili zasticeni, morate otvoriti 
skinute datotake kad ste offline, ili koristite Tor Uzivo DC kao sto je Tails. 
\n
 torbutton.popup.launch = Skini fajl

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-10-23 Thread translation
commit e26c3f059c3419aceebdfa3937fcc8be0e2a4134
Author: Translation commit bot 
Date:   Wed Oct 24 02:17:19 2018 +

Update translations for tba-android_stringsdtd
---
 hr/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/android_strings.dtd b/hr/android_strings.dtd
index ef35dbdc1..6ddb5668c 100644
--- a/hr/android_strings.dtd
+++ b/hr/android_strings.dtd
@@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-10-23 Thread translation
commit 50222ebac564edfa5fcb6dca11998dfe7dcdcc5e
Author: Translation commit bot 
Date:   Wed Oct 24 02:16:13 2018 +

Update translations for tails-misc
---
 hr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr.po b/hr.po
index ded8ea588..aa718b5c7 100644
--- a/hr.po
+++ b/hr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 14:43+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-10-24 02:12+\n"
+"Last-Translator: Karlo Prikratki \n"
 "Language-Team: Croatian 
(http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-10-23 Thread translation
commit dbeb1edc90a2dcbc67ac986ccb39566f14c0c231
Author: Translation commit bot 
Date:   Wed Oct 24 02:15:04 2018 +

Update translations for abouttor-homepage
---
 hr/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index 0474b90b5..919538ccf 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 

___
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] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
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] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
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' into maint-0.3.5

2018-10-23 Thread nickm
commit 131ab9d5233a2f452c608bf85a39255903d036c1
Merge: 289a7dbac fd6078b33
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:04 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" version to avoid removing rust use declaration.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
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

2018-10-23 Thread nickm
commit 5fde2c2544ae7315939e56a47e2af2d44cce3922
Merge: 8a0728789 b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:16 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9
Merge: 7edc594ee b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:53 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)




___
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

2018-10-23 Thread nickm
commit 274ef2637fc09444212147bcd625c6a16eae0765
Merge: 271144c99 fd6078b33
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:16 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-10-23 Thread nickm
commit 131ab9d5233a2f452c608bf85a39255903d036c1
Merge: 289a7dbac fd6078b33
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:04 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" version to avoid removing rust use declaration.

___
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

2018-10-23 Thread nickm
commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9
Merge: 7edc594ee b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:53 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9
Merge: 7edc594ee b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:53 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
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] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-10-23 Thread nickm
commit 5db592522a762802e5d6f7c47f11d4e91dd35a06
Merge: 05d65cb06 131ab9d52
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:16 2018 -0400

Merge branch 'maint-0.3.5'

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-10-23 Thread nickm
commit 131ab9d5233a2f452c608bf85a39255903d036c1
Merge: 289a7dbac fd6078b33
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:04 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" version to avoid removing rust use declaration.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9
Merge: 7edc594ee b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:53 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)




___
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

2018-10-23 Thread nickm
commit fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9
Merge: 7edc594ee b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:53 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
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] Remove a now-unused rust "use".

2018-10-23 Thread nickm
commit b2c52f5d6d52a70e11bb4f60036dd6772b55661a
Author: Nick Mathewson 
Date:   Tue Oct 23 19:50:45 2018 -0400

Remove a now-unused rust "use".
---
 src/rust/protover/ffi.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 8ab11842d..8d9f4b874 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
 
 use libc::{c_char, c_int, uint32_t};
 use std::ffi::CStr;
-use std::ffi::CString;
 
 use smartlist::*;
 use tor_allocate::allocate_and_copy_string;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-10-23 Thread nickm
commit 05d65cb067d542a2d7eb001aa300fd8b836a84a0
Merge: afc22ec53 289a7dbac
Author: Nick Mathewson 
Date:   Tue Oct 23 19:22:05 2018 -0400

Merge branch 'maint-0.3.5'

 changes/bug27740 | 4 
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 4 files changed, 11 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.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-10-23 Thread nickm
commit 289a7dbac32a981897e12a3c250f0b6c67eec809
Merge: 1ae911660 7edc594ee
Author: Nick Mathewson 
Date:   Tue Oct 23 19:21:44 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug27740 | 4 
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 4 files changed, 11 insertions(+)

diff --cc src/rust/protover/ffi.rs
index 0c28d032c,f55b87acf..f17f30127
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@@ -57,17 -58,17 +57,20 @@@ pub extern "C" fn protover_all_supporte
  
  let relay_proto_entry: UnvalidatedProtoEntry =
  match UnvalidatedProtoEntry::from_str_any_len(relay_version) {
 -Ok(n)  => n,
 -Err(_) => return 1,
 -};
 -let maybe_unsupported: Option = 
relay_proto_entry.all_supported();
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
  
 -if maybe_unsupported.is_some() {
 -let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
 +if let Some(unsupported) = relay_proto_entry.all_supported() {
+ if missing_out.is_null() {
+ return 0;
+ }
 -let ptr = allocate_and_copy_string(_string());
 +let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
 +
 +let ptr = c_unsupported.into_raw();
  unsafe { *missing_out = ptr };
  
  return 0;

___
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/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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] rust/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
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/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
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 remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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.3' into maint-0.3.4

2018-10-23 Thread nickm
commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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

2018-10-23 Thread nickm
commit 271144c99e00d0596d3a8f7e2c278f2b2789c115
Merge: 64f363737 7edc594ee
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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.4' into maint-0.3.5

2018-10-23 Thread nickm
commit 289a7dbac32a981897e12a3c250f0b6c67eec809
Merge: 1ae911660 7edc594ee
Author: Nick Mathewson 
Date:   Tue Oct 23 19:21:44 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug27740 | 4 
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 4 files changed, 11 insertions(+)

diff --cc src/rust/protover/ffi.rs
index 0c28d032c,f55b87acf..f17f30127
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@@ -57,17 -58,17 +57,20 @@@ pub extern "C" fn protover_all_supporte
  
  let relay_proto_entry: UnvalidatedProtoEntry =
  match UnvalidatedProtoEntry::from_str_any_len(relay_version) {
 -Ok(n)  => n,
 -Err(_) => return 1,
 -};
 -let maybe_unsupported: Option = 
relay_proto_entry.all_supported();
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
  
 -if maybe_unsupported.is_some() {
 -let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
 +if let Some(unsupported) = relay_proto_entry.all_supported() {
+ if missing_out.is_null() {
+ return 0;
+ }
 -let ptr = allocate_and_copy_string(_string());
 +let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
 +
 +let ptr = c_unsupported.into_raw();
  unsafe { *missing_out = ptr };
  
  return 0;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] rust/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] rust/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
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

2018-10-23 Thread nickm
commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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 remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] rust/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
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/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-10-23 Thread nickm
commit 289a7dbac32a981897e12a3c250f0b6c67eec809
Merge: 1ae911660 7edc594ee
Author: Nick Mathewson 
Date:   Tue Oct 23 19:21:44 2018 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug27740 | 4 
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 4 files changed, 11 insertions(+)

diff --cc src/rust/protover/ffi.rs
index 0c28d032c,f55b87acf..f17f30127
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@@ -57,17 -58,17 +57,20 @@@ pub extern "C" fn protover_all_supporte
  
  let relay_proto_entry: UnvalidatedProtoEntry =
  match UnvalidatedProtoEntry::from_str_any_len(relay_version) {
 -Ok(n)  => n,
 -Err(_) => return 1,
 -};
 -let maybe_unsupported: Option = 
relay_proto_entry.all_supported();
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
  
 -if maybe_unsupported.is_some() {
 -let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
 +if let Some(unsupported) = relay_proto_entry.all_supported() {
+ if missing_out.is_null() {
+ return 0;
+ }
 -let ptr = allocate_and_copy_string(_string());
 +let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 +Ok(n) => n,
 +Err(_) => return 1,
 +};
 +
 +let ptr = c_unsupported.into_raw();
  unsafe { *missing_out = ptr };
  
  return 0;

___
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 remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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.3' into release-0.3.3

2018-10-23 Thread nickm
commit 8a0728789b1943ba39f41c1f09fe5da50838464c
Merge: cf1906542 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
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/protover: return C-allocated string in protover_all_supported()

2018-10-23 Thread nickm
commit 42558df7c8affeec33e66d987ccf4d632a9d5466
Author: cypherpunks 
Date:   Fri Sep 21 05:16:22 2018 +

rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.
---
 changes/bug27740 | 4 
 src/rust/protover/ffi.rs | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changes/bug27740 b/changes/bug27740
new file mode 100644
index 0..76a17b7dd
--- /dev/null
+++ b/changes/bug27740
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+- Return a string that can be safely freed by C code, not one created by
+  the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix
+  on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index ca9a504fe..8ab11842d 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -71,12 +71,7 @@ pub extern "C" fn protover_all_supported(
 if missing_out.is_null() {
 return 0;
 }
-let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
-Ok(n) => n,
-Err(_) => return 1,
-};
-
-let ptr = c_unsupported.into_raw();
+let ptr = allocate_and_copy_string(_string());
 unsafe { *missing_out = ptr };
 
 return 0;



___
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 remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] rust/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] rust/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-23 Thread nickm
commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
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 remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

2018-10-23 Thread nickm
commit 169bc670ddf9fe898800a2814a1ec30dcc3249da
Merge: 93fd924bd 42558df7c
Author: Nick Mathewson 
Date:   Tue Oct 23 19:17:48 2018 -0400

Merge remote-tracking branch 'onionk/rust-allsupportednull1' into 
maint-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 insertions(+), 6 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.3] rust/protover: fix null deref in protover_all_supported()

2018-10-23 Thread nickm
commit db89b4b1527103455e1bd85839a88d614a402354
Author: cypherpunks 
Date:   Fri Sep 21 04:57:26 2018 +

rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.
---
 changes/bug27804 | 3 +++
 src/rust/protover/ffi.rs | 3 +++
 src/test/test_protover.c | 1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug27804 b/changes/bug27804
new file mode 100644
index 0..fa7fec0bc
--- /dev/null
+++ b/changes/bug27804
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Fix a potential null dereference in protover_all_supported().
+  Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index 9656e8c31..ca9a504fe 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -68,6 +68,9 @@ pub extern "C" fn protover_all_supported(
 
 if maybe_unsupported.is_some() {
 let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
+if missing_out.is_null() {
+return 0;
+}
 let c_unsupported: CString = match 
CString::new(unsupported.to_string()) {
 Ok(n) => n,
 Err(_) => return 1,
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index fb374c728..d1fc7752d 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -259,6 +259,7 @@ test_protover_all_supported(void *arg)
   tt_ptr_op(msg, OP_EQ, NULL);
 
   // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", NULL));
   tt_assert(! protover_all_supported("Wombat=9", ));
   tt_str_op(msg, OP_EQ, "Wombat=9");
   tor_free(msg);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add new Tor Browser version: 8.5a4

2018-10-23 Thread boklm
commit 7f400c4b2056765aad4d75168883d63b681ca664
Author: Nicolas Vigier 
Date:   Tue Oct 23 23:01:21 2018 +0200

Add new Tor Browser version: 8.5a4
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index cdd33734..24a8b55e 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -26,8 +26,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.5a3
-2018-10-05
+8.5a4
+2018-10-23
 
 # If all platforms are on the same version, you only need to update
 # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 42553d54..e37a7b25 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -10,5 +10,9 @@
 "8.5a3",
 "8.5a3-MacOS",
 "8.5a3-Linux",
-"8.5a3-Windows"
+"8.5a3-Windows",
+"8.5a4",
+"8.5a4-MacOS",
+"8.5a4-Linux",
+"8.5a4-Windows"
 ]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-10-23 Thread translation
commit 60606a01d56dcf144219d22519edd598b49dd478
Author: Translation commit bot 
Date:   Tue Oct 23 19:48:29 2018 +

Update translations for torbutton-browseronboardingproperties
---
 he/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties
index 8865f0c85..13cb89ab3 100644
--- a/he/browserOnboarding.properties
+++ b/he/browserOnboarding.properties
@@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=ראה 
שאלות נפוצות
 
 onboarding.tour-tor-onion-services=שירותי בצל
 onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן.
-onboarding.tour-tor-onion-services.description=שירותי בצל הם 
אתרים המסתיימים עם .onion המספק הגנות אקסטרה 
אל מפרסמים ומבקרים, כולל אמצעיי הגנה 
שהתווספו נגד צנזורה. שירותי בצל מתירים לכל 
אחד לספק תוכן ושירותים באופן אלמוני. לחץ 
למטה כדי לבקר באתר הבצל DuckDuckGo.
+onboarding.tour-tor-onion-services.description=שירותי בצל הם 
אתרים המסתיימים עם .onion המספקים הגנות 
אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה 
שהתווספו נגד צנזורה. שירותי בצל מתירים לכל 
אחד לספק תוכן ושירותים באופן אלמוני. לחץ 
למטה כדי לבקר באתר הבצל DuckDuckGo.
 onboarding.tour-tor-onion-services.button=בקר בבצל
 
 # Circuit Display onboarding.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torcheck] Update translations for torcheck

2018-10-23 Thread translation
commit 63a555ca7f87e2009aaf5248713aec926afa2dd8
Author: Translation commit bot 
Date:   Tue Oct 23 19:48:39 2018 +

Update translations for torcheck
---
 cs/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs/torcheck.po b/cs/torcheck.po
index ee3b1aea7..3769dbe9c 100644
--- a/cs/torcheck.po
+++ b/cs/torcheck.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-10-19 17:38+\n"
-"Last-Translator: Michal Stanke \n"
+"PO-Revision-Date: 2018-10-23 19:36+\n"
+"Last-Translator: Jakub Rychlý \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

2018-10-23 Thread translation
commit 3267d5ceabaa67eb2945fe11fa29367b67ec8f00
Author: Translation commit bot 
Date:   Tue Oct 23 19:48:34 2018 +

Update translations for torbutton-browseronboardingproperties_completed
---
 he/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties
index 8865f0c85..13cb89ab3 100644
--- a/he/browserOnboarding.properties
+++ b/he/browserOnboarding.properties
@@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=ראה 
שאלות נפוצות
 
 onboarding.tour-tor-onion-services=שירותי בצל
 onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן.
-onboarding.tour-tor-onion-services.description=שירותי בצל הם 
אתרים המסתיימים עם .onion המספק הגנות אקסטרה 
אל מפרסמים ומבקרים, כולל אמצעיי הגנה 
שהתווספו נגד צנזורה. שירותי בצל מתירים לכל 
אחד לספק תוכן ושירותים באופן אלמוני. לחץ 
למטה כדי לבקר באתר הבצל DuckDuckGo.
+onboarding.tour-tor-onion-services.description=שירותי בצל הם 
אתרים המסתיימים עם .onion המספקים הגנות 
אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה 
שהתווספו נגד צנזורה. שירותי בצל מתירים לכל 
אחד לספק תוכן ושירותים באופן אלמוני. לחץ 
למטה כדי לבקר באתר הבצל DuckDuckGo.
 onboarding.tour-tor-onion-services.button=בקר בבצל
 
 # Circuit Display onboarding.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2018-10-23 Thread translation
commit 301bc2d49eda4e4d869611ea3018d6282a64566b
Author: Translation commit bot 
Date:   Tue Oct 23 19:48:45 2018 +

Update translations for torcheck_completed
---
 cs/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs/torcheck.po b/cs/torcheck.po
index ee3b1aea7..3769dbe9c 100644
--- a/cs/torcheck.po
+++ b/cs/torcheck.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2018-10-19 17:38+\n"
-"Last-Translator: Michal Stanke \n"
+"PO-Revision-Date: 2018-10-23 19:36+\n"
+"Last-Translator: Jakub Rychlý \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit f6c46591eae1603c99dad93d555ecb7c3d21251e
Author: Translation commit bot 
Date:   Tue Oct 23 19:45:20 2018 +

Update translations for donatepages-messagespot
---
 locale/he/LC_MESSAGES/messages.po | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/locale/he/LC_MESSAGES/messages.po 
b/locale/he/LC_MESSAGES/messages.po
index c9c7a2308..512ce9a62 100644
--- a/locale/he/LC_MESSAGES/messages.po
+++ b/locale/he/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgstr "מדיניות פרטיות תורמים"
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:58
 msgid ""
 "The Tor Project respects donor privacy and welcomes anonymous donations."
-msgstr ""
+msgstr "מיזם Tor מכבד פרטיות תורמים ומברך 
תרומות אלמוניות."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:60
 msgid ""
@@ -29,6 +29,8 @@ msgid ""
 "anonymity is by donating using a method that doesn't disclose your personal "
 "information."
 msgstr ""
+"אם להיות אלמוני זה חשוב לך, הדרך הטובה 
ביותר לשמר את אלמוניותך היא ע\"י "
+"תרומה באמצעות שיאה שאינה מסגירה את המידע 
האישי שלך."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65
 msgid ""
@@ -97,11 +99,11 @@ msgstr ""
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:91
 msgid ""
 "We will never publicly identify you as a donor without your permission."
-msgstr ""
+msgstr "לעולם לא נזהה אותך באופן ציבורי בתור 
תורם ללא רשותך."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:96
 msgid "We do not publish, sell, trade, or rent any information about you."
-msgstr ""
+msgstr "אנחנו לא מפרסמים, מוכרים, סוחרים או 
משכירים מידע כלשהו עליך."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:98
 msgid ""
@@ -216,6 +218,8 @@ msgid ""
 "This page requires Javascript to do PayPal or credit card\n"
 "  donations, but it appears you have Javascript disabled."
 msgstr ""
+"דף זה דורש JavaScript כדי לבצע תרומות באמצעות 
PayPal או\n"
+"  באמצעות כרטיס אשראי, אבל נראה שיש לך 
JavaScript מושבת."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:96
 msgid ""
@@ -480,7 +484,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:477
 msgid "validation failed"
-msgstr ""
+msgstr "וידוא נכשל"
 
 #. notes: __field_name__ will be replaced with the field name in the
 #. javascript.
@@ -568,7 +572,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:85
 msgid "The Tor network depends on volunteers."
-msgstr ""
+msgstr "רשת Tor מסתמכת על מתנדבים."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:91
 msgid ""
@@ -705,7 +709,7 @@ msgstr "האם כל אחד יכול להשתמש ב־Tor?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:110
 msgid "Yes! Tor is free, and anyone can use it."
-msgstr ""
+msgstr "כן! Tor הוא חינמי וכל אחד יכול להשתמש בו."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:112
 msgid ""
@@ -713,6 +717,9 @@ msgid ""
 "href=\"https://www.torproject.org/projects/torbrowser.html.en\;>download Tor Browser."
 msgstr ""
+"כדי להתחיל, תצטרך https://www.torproject.org/projects/torbrowser.html.en\;>להוריד את דפדפן Tor."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:114
 msgid ""
@@ -791,6 +798,7 @@ msgid ""
 "I would like to know more about how Tor works, what hidden services are, or "
 "how to run a relay."
 msgstr ""
+"אני רוצה לדעת עוד על איך Tor עובד, מה הם 
שירותים נסתרים, או איך להריץ ממסר."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:157
 msgid ""
@@ -1036,6 +1044,8 @@ msgid ""
 "If you run into problems, please contact giving(at)torproject.org."
 msgstr ""
+"אם אתה נתקל בבעיות, אנא צור קשר בכתובת giving(at)torproject.org."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:303
 msgid ""
@@ -1051,7 +1061,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:307
 msgid "If you run into any problems donating via PayPal, please let us 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-10-23 Thread translation
commit 26fb16093dbf6f1d1b853c123a8339885c57029e
Author: Translation commit bot 
Date:   Tue Oct 23 19:16:06 2018 +

Update translations for tails-misc
---
 fr.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/fr.po b/fr.po
index 8d501a59d..2cde82ab9 100644
--- a/fr.po
+++ b/fr.po
@@ -29,7 +29,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-18 21:48+\n"
+"PO-Revision-Date: 2018-10-23 19:07+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgid ""
 "To add more, install some software using Synaptic Package Manager or APT on the command line."
-msgstr "Pour en ajouter, installez des logiciels en utilisant le Gestionnaire de Paquets Synaptic ou APT à partir de la ligne de commande."
+msgstr "Pour en ajouter d’autres, installez des logiciels en utilisant le Gestionnaire de paquets Synaptic ou APT sur la ligne de commande."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
@@ -178,7 +178,7 @@ msgstr "{details} Veuillez consulter votre liste de 
logiciels supplémentaires o
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
-msgstr "Veuillez consulter votre liste de logiciels additionnels ou lire le 
journal système pour comprendre le problème."
+msgstr "Veuillez consulter votre liste de logiciels supplémentaires ou lire 
le journal système pour comprendre le problème."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Show Log"
@@ -226,7 +226,7 @@ msgstr "Installer une seul fois seulement"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362
 msgid "The configuration of your additional software failed."
-msgstr "La configuration de votre logiciel additionnel a échoué."
+msgstr "Échec de configuration de vos logiciels supplémentaires."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315
 msgid ""
@@ -289,15 +289,15 @@ msgstr "Cela peut prendre plusieurs minutes."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545
 msgid "The installation of your additional software failed"
-msgstr "L'installation de votre logiciel additionnel a échoué"
+msgstr "Échec d’installation de vos logiciels supplémentaires."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560
 msgid "Additional software installed successfully"
-msgstr "Logiciel additionnel installé avec succès"
+msgstr "Les logiciels supplémentaires ont été installés avec succès"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:580
 msgid "The check for upgrades of your additional software failed"
-msgstr "La recherche de mise à jour de vos logiciels additionnels a échoué"
+msgstr "Échec de recherche de mises à niveau de vos logiciels 
supplémentaires."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:590
@@ -308,7 +308,7 @@ msgstr "Vérifiez votre connexion internet, redémarrer 
Tails, ou lisez le journ
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589
 msgid "The upgrade of your additional software failed"
-msgstr "La mise à jour de votre logiciel additionnel a échoué"
+msgstr "Échec de mise à niveau de vos logiciels supplémentaires."
 
 #: 
config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37
 msgid "Documentation"
@@ -321,18 +321,18 @@ msgstr "Documentation"
 msgid ""
 "Remove {package} from your additional software? This will stop installing "
 "the package automatically."
-msgstr "Voulez-vous supprimer [package] de vos logiciels additionnels ? Cela 
arrêtera son installation automatiquement."
+msgstr "Voulez-vous supprimer [package] de vos logiciels supplémentaires ? 
Cela arrêtera l’installation automatique du paquet."
 
 #. Translators: Don't translate {pkg}, it's a placeholder and will be
 #. replaced.
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107
 #, python-brace-format
 msgid "Failed to remove {pkg}"
-msgstr "La suppression de {pkg} a échoué"
+msgstr "Échec de suppression de {pkg}"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124
 msgid "Failed to read additional software configuration"
-msgstr "La lecture du fichier de configuration du logiciel additionnel a 
échoué"
+msgstr "Échec de lecture de la configuration du logiciel supplémentaire"
 
 #. Translators: Don't translate {package}, it's a placeholder and 

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2018-10-23 Thread translation
commit 74f7393778155c2e84ee593165d61f30fa593615
Author: Translation commit bot 
Date:   Tue Oct 23 19:15:11 2018 +

Update translations for bridgedb
---
 cs/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 38675476a..a0c48bbb8 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -15,11 +15,11 @@
 # Vlastimil Burián , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-04 21:10+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-10-23 18:59+\n"
+"Last-Translator: Jakub Rychlý \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2018-10-23 Thread translation
commit 626bd8532062109c1b2096f8f6ac7e50689fa974
Author: Translation commit bot 
Date:   Tue Oct 23 19:15:17 2018 +

Update translations for bridgedb_completed
---
 cs/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 38675476a..a0c48bbb8 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -15,11 +15,11 @@
 # Vlastimil Burián , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-09-04 21:10+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-10-23 18:59+\n"
+"Last-Translator: Jakub Rychlý \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 63bef07c34c03a17caf8425d52d3c632e3aeedbb
Author: Translation commit bot 
Date:   Tue Oct 23 18:45:20 2018 +

Update translations for donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 9 +
 1 file changed, 9 insertions(+)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 5cd1acbad..03ecbd811 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -45,12 +45,18 @@ msgid ""
 "be collected and retained by third-party service providers and/or the Tor "
 "Project, as described below."
 msgstr ""
+"Bağış sürecinin bir parçası olarak kişisel bilgi sağlarsanız, 
aşağıda "
+"açıklandığı gibi üçüncü taraf hizmet sağlayıcıları ve / veya Tor 
Projesi "
+"tarafından toplanabilir ve saklanabilir."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:67
 msgid ""
 "The Tor Project has very little influence over how third-party service "
 "providers, such as PayPal, may collect and use your information."
 msgstr ""
+"Tor Project'in, PayPal gibi üçüncü taraf hizmet sağlayıcılarının "
+"bilgilerinizi nasıl toplayabileceği ve kullanabileceği konusunda çok az "
+"yetkisi vardır,bilgilerinizi toplayabilir ve kullanabilir."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:69
 msgid ""
@@ -65,6 +71,9 @@ msgid ""
 " learn your name, the amount you donated, your email address, phone number "
 "and/or mailing address, as well as any other information you provide."
 msgstr ""
+"Tor Projesine bağış yaptığınızda, hangi mekanizmayı 
kullandığınıza bağlıdır,"
+" adınızı , bağışladığınız tutarı, e-posta adresinizi, telefon 
numaranızı ve "
+"/ veya posta adresinizi ve sağladığınız diğer bilgileri 
öğrenebiliriz."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 28d1164bb180180d2c87ef72915dd11e11533299
Author: Translation commit bot 
Date:   Tue Oct 23 18:15:20 2018 +

Update translations for donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 8e0522dc1..5cd1acbad 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -6,9 +6,10 @@
 # Translinguini , 2018
 # escher , 2018
 # Hakan Y , 2018
+# Arda Büyükkaya , 2018
 msgid ""
 msgstr ""
-"Last-Translator: Hakan Y , 2018\n"
+"Last-Translator: Arda Büyükkaya , 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -19,12 +20,14 @@ msgstr "Tor Gizlilik Ä°lkesi"
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44
 msgid "Donor privacy policy"
-msgstr ""
+msgstr "Bağış gizlilik ilkesi"
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:58
 msgid ""
 "The Tor Project respects donor privacy and welcomes anonymous donations."
 msgstr ""
+"Tor Projesi bağışçı mahremiyetine saygı duyar ve anonim bağışları "
+"memnuniyetle karşılar."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:60
 msgid ""
@@ -32,6 +35,9 @@ msgid ""
 "anonymity is by donating using a method that doesn't disclose your personal "
 "information."
 msgstr ""
+"Eğer sizin için anonim kalmak önemli ise ,anonimliğinizi korumak için en 
iyi"
+" yol, kişisel bilgilerinizi ifşa etmeyen bir yöntem kullanarak bağış "
+"yapmaktır."
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65
 msgid ""
@@ -178,7 +184,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:85
 msgid "XL"
-msgstr ""
+msgstr "XL"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:89
 msgid "XXL"
@@ -308,7 +314,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:243
 msgid "sweatshirt"
-msgstr ""
+msgstr "Sweatshirt"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:250
 msgid ""
@@ -322,7 +328,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:268
 msgid "Credit Card"
-msgstr ""
+msgstr "Kredi Kartı"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:278
 msgid "Your Info"
@@ -342,7 +348,7 @@ msgstr "Son Ä°sim"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:297
 msgid "Street Address"
-msgstr "Cadde Adresi"
+msgstr "Sokak Adresi"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:301
 msgid "Apt."
@@ -362,7 +368,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:326
 msgid "Enter email"
-msgstr ""
+msgstr "Email girin "
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330
 msgid "Well email you your receipt"
@@ -378,7 +384,7 @@ msgstr "Kart Numarası"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351
 msgid "MM"
-msgstr ""
+msgstr "MM"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:355
 msgid "YY"
@@ -457,7 +463,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:461
 msgid "Choose your size."
-msgstr ""
+msgstr "Ölçünüzü seçin."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:465
 msgid "Sweatshirt"
@@ -475,7 +481,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:477
 msgid "validation failed"
-msgstr ""
+msgstr "onaylama başarısız oldu"
 
 #. notes: __field_name__ will be replaced with the field name in the
 #. javascript.
@@ -1367,6 +1373,9 @@ msgid ""
 "stickers, are presented on our main https://donate.torproject.org\;>donation page."
 msgstr ""
+"https://donate.torproject.org\;>Bağış sayfamızda  
bağışta "
+"bulunanlar için, tişört, kapüşon ve çıkartmalar gibi çeşitli 
teşekkür "
+"hediyeleri bulunmaktadır."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:533
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Fix Tor Browser release date

2018-10-23 Thread boklm
commit 3237319afa9dfcdc3189f4b7e76786d6fa9ec301
Author: Nicolas Vigier 
Date:   Tue Oct 23 19:55:57 2018 +0200

Fix Tor Browser release date
---
 include/versions.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 29105f70..cdd33734 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -5,7 +5,7 @@
 
 # *** tor browser stable ***
 8.0.3
-2018-10-19
+2018-10-23
 0.3.4.8
 
 # If all platforms are on the same version, you only need to update

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add new Tor Browser version: 8.0.3

2018-10-23 Thread boklm
commit 50808d86c87416508abddbd999079b99aec4af4b
Author: Nicolas Vigier 
Date:   Tue Oct 23 19:47:29 2018 +0200

Add new Tor Browser version: 8.0.3
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 157b8584..29105f70 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,8 +4,8 @@
 maint-7.5
 
 # *** tor browser stable ***
-8.0.2
-2018-10-03
+8.0.3
+2018-10-19
 0.3.4.8
 
 # If all platforms are on the same version, you only need to update
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index af40b2f2..42553d54 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "8.0.2-MacOS",
 "8.0.2-Linux",
 "8.0.2-Windows",
+"8.0.3",
+"8.0.3-MacOS",
+"8.0.3-Linux",
+"8.0.3-Windows",
 "8.5a3",
 "8.5a3-MacOS",
 "8.5a3-Linux",

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 6f2e0eaf3a5b14a71fc27dd1103161a945912f18
Author: Translation commit bot 
Date:   Tue Oct 23 17:45:19 2018 +

Update translations for donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index cb12f89ce..8e0522dc1 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -15,7 +15,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:34
 msgid "Tor Privacy Policy"
-msgstr ""
+msgstr "Tor Gizlilik Ä°lkesi"
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44
 msgid "Donor privacy policy"
@@ -150,7 +150,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:48
 msgid "Classic"
-msgstr ""
+msgstr "Klasik"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:55
 msgid "European"
@@ -334,15 +334,15 @@ msgstr " * gerekli alanlar"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:287
 msgid "First Name"
-msgstr ""
+msgstr "Ä°lk Ä°sim"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:291
 msgid "Last Name"
-msgstr ""
+msgstr "Son Ä°sim"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:297
 msgid "Street Address"
-msgstr ""
+msgstr "Cadde Adresi"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:301
 msgid "Apt."
@@ -374,7 +374,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:344
 msgid "Card Number"
-msgstr ""
+msgstr "Kart Numarası"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351
 msgid "MM"
@@ -525,7 +525,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34
 msgid "Tor Thanks You"
-msgstr ""
+msgstr "Tor Size Teşekkür Ediyor"
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:44
 msgid "Thank you!"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 1baba8aa52cb42abf9077cb0c10bb84de49dce77
Author: Translation commit bot 
Date:   Tue Oct 23 17:15:21 2018 +

Update translations for donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 836d98e21..cb12f89ce 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -5,9 +5,10 @@
 # efe kerem sözeri , 2018
 # Translinguini , 2018
 # escher , 2018
+# Hakan Y , 2018
 msgid ""
 msgstr ""
-"Last-Translator: escher , 2018\n"
+"Last-Translator: Hakan Y , 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -235,7 +236,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:111
 msgid "monthly"
-msgstr ""
+msgstr "Aylık"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:118
 msgid "Want to donate Bitcoin, Stock, or via snail mail?"
@@ -247,7 +248,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:137
 msgid "$2 minimum donation"
-msgstr ""
+msgstr "Minimum $2 bağış"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:141
 msgid "$ other"
@@ -329,7 +330,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:282
 msgid "* required fields"
-msgstr ""
+msgstr " * gerekli alanlar"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:287
 msgid "First Name"
@@ -353,7 +354,7 @@ msgstr "Şehir"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315
 msgid "region"
-msgstr ""
+msgstr "bölge"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320
 msgid "Zip"
@@ -395,7 +396,7 @@ msgstr ""
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:372
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380
 msgid "T-shirt:"
-msgstr ""
+msgstr "Tişört:"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:394

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Removed spanish version of the banner

2018-10-23 Thread hiro
commit ef90b4eaa63eaa0e5a6c72515c11effa456eb882
Author: hiro 
Date:   Tue Oct 23 18:31:51 2018 +0200

Removed spanish version of the banner
---
 es/banner.wmi |   6 --
 es/index.wml  | 204 --
 es/navigation.wmi |  29 
 3 files changed, 239 deletions(-)

diff --git a/es/banner.wmi b/es/banner.wmi
deleted file mode 100644
index 8bcbcf42..
--- a/es/banner.wmi
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-  
-  
-
diff --git a/es/index.wml b/es/index.wml
deleted file mode 100644
index ba23ea7a..
--- a/es/index.wml
+++ /dev/null
@@ -1,204 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 1-high
-#include "banner.wmi"
-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
-
-es-ES
-
-
-
-   
-   
-   
-   Tor prevents people from learning your location or browsing 
habits.
-Tor is for web browsers, instant messaging clients, and 
more.
-Tor is free and open source for Windows, Mac, Linux/Unix, and 
Android
-  
-   Anonymity Online
-  Protect your privacy. Defend yourself against 
network surveillance and traffic analysis.
-
-  
-
-  Download Tor
-  
-  
-
-  
-What is Tor? Tor is free software and an open
-network that helps you defend against traffic analysis,
-a form of network surveillance that
-threatens personal freedom and privacy, confidential business
-activities and relationships, and state security.
-Learn
-more about Tor 
-  
-  
-  
-  Why Anonymity Matters
-  Tor protects you by bouncing your communications around a
-  distributed network of relays run by volunteers all around
-  the world: it prevents somebody watching your Internet
-  connection from learning what sites you visit, and it prevents
-  the sites you visit from learning your physical location.
-  Get involved with Tor
-  
-  
-
-
-
-  Our Projects
-  
-  
-
-  
-  
-
-
-Tor
-Browser
-Tor Browser contains everything you need to safely
-browse the Internet.
-
-  
-  
-
-https://guardianproject.info/apps/orbot/;>
-https://guardianproject.info/apps/orbot/;>Orbot
-Tor for Google Android devices.
-
-  
-
-
-  
-
-https://tails.boum.org/;>
-https://tails.boum.org/;>Tails
-Live CD/USB operating system preconfigured to use
-Tor safely.
-
-  
-  
-  
-
-https://nyx.torproject.org/;>
-https://nyx.torproject.org/;>Nyx
-Terminal (command line) application for monitoring
-and configuring Tor.
-
-  
-
-
-
- 
-  
-https://metrics.torproject.org/rs.html;>
-https://metrics.torproject.org/rs.html;>Relay
-Search
-Site providing an overview of the Tor network.
-
-  
-
-  
-
-
-Pluggable 
Transports
-Pluggable transports help you circumvent censorship.
-
-  
-
-
-  
-   
-  https://stem.torproject.org/;>
-  https://stem.torproject.org/;>Stem
-  Library for writing scripts and applications that interact
-  with Tor.
-
-  
-  
-   
-  https://ooni.torproject.org/;>
-   https://ooni.torproject.org/;>OONI
-   Global observatory monitoring for network censorship.
-   
-   
-
-  
- Learn more 
about our projects 
-   
-
-  
-  
-  
-
-  We're hiring! 
-
-  
-#include 
-  
-   
-  Who Uses Tor?
- 
-  
-
-  Family  Friends
-
-People like you and your family use Tor to protect themselves, 
their children, and their dignity while using the Internet.
-  
-  
-
-  Businesses
-
-Businesses use Tor to research competition, keep business 
strategies 

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-10-23 Thread translation
commit f804f63d992a8528a8c25f471c7263cd726c8341
Author: Translation commit bot 
Date:   Tue Oct 23 15:49:18 2018 +

Update translations for tor-launcher-properties
---
 hr/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties
index 196c2f798..835dd1ff2 100644
--- a/hr/torlauncher.properties
+++ b/hr/torlauncher.properties
@@ -4,11 +4,11 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo 
može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u 
drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne 
riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće 
pokrenuti.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_exited=Tor je neočekivano prekinut. To može biti zbog 
greške u samom Tor-u, drugom programu na vašem sistemu ili zbog neispravnog 
hardvera. Dok ponovno ne pokrenete Tor, Tor preglednik neće moči pristupiti 
web stranicama. Ako se problem nastavi, pošaljite kopiju vašeg Tor zapisnika 
timu za podršku.
+torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti vaše kartice 
preglednika.
+torlauncher.tor_controlconn_failed=Povezivanje na kontrolni port Tor-a nije 
uspjelo.
+torlauncher.tor_failed_to_start=Pokretanje Tor-a nije uspjelo.
+torlauncher.tor_control_failed=Uzimanje kontrole nad Tor-om nije uspjelo
 torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-10-23 Thread translation
commit d0ec8bab9643b12ecb8945e443a3e7fcc9d90a6e
Author: Translation commit bot 
Date:   Tue Oct 23 15:18:58 2018 +

Update translations for tor-launcher-properties
---
 hr/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties
index c6143af09..196c2f798 100644
--- a/hr/torlauncher.properties
+++ b/hr/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be 
due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
+torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo 
može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u 
drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne 
riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće 
pokrenuti.
 torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
 torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 71a156da97a953cc8cb1d35416e1bf24d6ef7a7b
Author: Translation commit bot 
Date:   Tue Oct 23 15:15:22 2018 +

Update translations for donatepages-messagespot
---
 locale/hr/LC_MESSAGES/messages.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/locale/hr/LC_MESSAGES/messages.po 
b/locale/hr/LC_MESSAGES/messages.po
index fa806c967..1e08e5c54 100644
--- a/locale/hr/LC_MESSAGES/messages.po
+++ b/locale/hr/LC_MESSAGES/messages.po
@@ -3,9 +3,10 @@
 # erinm, 2018
 # Igor , 2018
 # Ljubo Šimić , 2018
+# Karlo Prikratki , 2018
 msgid ""
 msgstr ""
-"Last-Translator: Ljubo Šimić , 2018\n"
+"Last-Translator: Karlo Prikratki , 2018\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
@@ -167,7 +168,7 @@ msgstr "S"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:77
 msgid "M"
-msgstr ""
+msgstr "v"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:81
 msgid "L"

___
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

2018-10-23 Thread translation
commit 4c7d1c81fa32a0277a2b8f466c89c0894aeeccbe
Author: Translation commit bot 
Date:   Tue Oct 23 15:15:04 2018 +

Update translations for abouttor-homepage
---
 hr/aboutTor.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index a83b575c4..0474b90b5 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -11,21 +11,21 @@
 
 
 
-
+
 https://duckduckgo.com;>
 
-
-
+
+
 
-
-
+
+
 
 
-
+
 https://www.torproject.org/getinvolved/volunteer.html.en;>
 
 
-
+
 
 
 
@@ -34,9 +34,9 @@
 
 
 
-
+
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2018-10-23 Thread translation
commit 5f5bc635e158c006c2e0d9e0bf9331338b1fc202
Author: Translation commit bot 
Date:   Tue Oct 23 14:48:38 2018 +

Update translations for torbutton-aboutdialogdtd
---
 hr/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd
index 9cd01c5cf..1285b429e 100644
--- a/hr/aboutdialog.dtd
+++ b/hr/aboutdialog.dtd
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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

2018-10-23 Thread translation
commit 6ac8de7df8adfe0dac12012e068ad8612fc22287
Author: Translation commit bot 
Date:   Tue Oct 23 14:45:04 2018 +

Update translations for abouttor-homepage
---
 hr/aboutTor.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index 4e422a41b..a83b575c4 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -6,10 +6,10 @@
 
 
 
-
-
+
+
 
-
+
 
 
 https://duckduckgo.com;>

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Change homepage url

2018-10-23 Thread hiro
commit 817cc58397bcd81cf6b1b096be545c307e6f2a9d
Author: hiro 
Date:   Tue Oct 23 15:49:03 2018 +0200

Change homepage url
---
 en/banner.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/banner.wmi b/en/banner.wmi
index da044de3..bb914cc8 100644
--- a/en/banner.wmi
+++ b/en/banner.wmi
@@ -11,7 +11,7 @@
 Give today, and Mozilla will match 
your donation.
   
   
-https://donate.torproject.org/;>Count me in
+https://torproject.org/donate/donate-sin-hp1;>Count me in
   
 
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-10-23 Thread translation
commit 227eed3525eb461b174a5114cc7470f2c9914351
Author: Translation commit bot 
Date:   Tue Oct 23 13:46:15 2018 +

Update translations for tails-misc_completed
---
 ru.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ru.po b/ru.po
index a233661b2..d15115183 100644
--- a/ru.po
+++ b/ru.po
@@ -9,6 +9,7 @@
 # Andrey, 2017
 # Антон Толмачев , 2016
 # Denis Denis , 2014
+# Emma Peel, 2018
 # Eugene, 2013
 # Иван Лапенков, 2015
 # joshua ridney, 2015
@@ -32,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-16 13:51+\n"
-"Last-Translator: Legenden Rifk \n"
+"PO-Revision-Date: 2018-10-23 13:23+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -342,7 +343,7 @@ msgstr "Не удалось прочитать 
дополнительную ко
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
 #, python-brace-format
 msgid "Stop installing {package} automatically"
-msgstr "Прекратить установку {packege} 
автоматически"
+msgstr "Прекратить установку {package} 
автоматически"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-10-23 Thread translation
commit bea915cb470a200138851179dc2b45bc284190dd
Author: Translation commit bot 
Date:   Tue Oct 23 13:46:10 2018 +

Update translations for tails-misc
---
 ru.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ru.po b/ru.po
index a233661b2..d15115183 100644
--- a/ru.po
+++ b/ru.po
@@ -9,6 +9,7 @@
 # Andrey, 2017
 # Антон Толмачев , 2016
 # Denis Denis , 2014
+# Emma Peel, 2018
 # Eugene, 2013
 # Иван Лапенков, 2015
 # joshua ridney, 2015
@@ -32,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-16 13:51+\n"
-"Last-Translator: Legenden Rifk \n"
+"PO-Revision-Date: 2018-10-23 13:23+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -342,7 +343,7 @@ msgstr "Не удалось прочитать 
дополнительную ко
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
 #, python-brace-format
 msgid "Stop installing {package} automatically"
-msgstr "Прекратить установку {packege} 
автоматически"
+msgstr "Прекратить установку {package} 
автоматически"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add link from donate button

2018-10-23 Thread hiro
commit 1b6e15c1b73e7d5cc4246b03b630d1351aef3854
Author: hiro 
Date:   Tue Oct 23 15:36:44 2018 +0200

Add link from donate button
---
 en/banner.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/banner.wmi b/en/banner.wmi
index 17f86568..da044de3 100644
--- a/en/banner.wmi
+++ b/en/banner.wmi
@@ -11,7 +11,7 @@
 Give today, and Mozilla will match 
your donation.
   
   
-Count me in
+https://donate.torproject.org/;>Count me in
   
 
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add eoy campaign to site

2018-10-23 Thread hiro
commit fff3216d249f670b970ff0f61a2082a893f23ab7
Author: hiro 
Date:   Fri Oct 19 18:27:27 2018 +0200

Add eoy campaign to site
---
 css/fonts/SourceCodePro/OFL.txt|  93 ++
 css/fonts/SourceCodePro/SourceCodePro-Black.ttf| Bin 0 -> 120356 bytes
 css/fonts/SourceCodePro/SourceCodePro-Bold.ttf | Bin 0 -> 120504 bytes
 .../SourceCodePro/SourceCodePro-ExtraLight.ttf | Bin 0 -> 121568 bytes
 css/fonts/SourceCodePro/SourceCodePro-Light.ttf| Bin 0 -> 121284 bytes
 css/fonts/SourceCodePro/SourceCodePro-Medium.ttf   | Bin 0 -> 120244 bytes
 css/fonts/SourceCodePro/SourceCodePro-Regular.ttf  | Bin 0 -> 120548 bytes
 css/fonts/SourceCodePro/SourceCodePro-Semibold.ttf | Bin 0 -> 120252 bytes
 css/fonts/SourceSansPro/OFL.txt|  93 ++
 css/fonts/SourceSansPro/SourceSansPro-Black.ttf| Bin 0 -> 288824 bytes
 .../SourceSansPro/SourceSansPro-BlackItalic.ttf| Bin 0 -> 102944 bytes
 css/fonts/SourceSansPro/SourceSansPro-Bold.ttf | Bin 0 -> 290916 bytes
 .../SourceSansPro/SourceSansPro-BoldItalic.ttf | Bin 0 -> 103200 bytes
 .../SourceSansPro/SourceSansPro-ExtraLight.ttf | Bin 0 -> 291112 bytes
 .../SourceSansPro-ExtraLightItalic.ttf | Bin 0 -> 104304 bytes
 css/fonts/SourceSansPro/SourceSansPro-Italic.ttf   | Bin 0 -> 103828 bytes
 css/fonts/SourceSansPro/SourceSansPro-Light.ttf| Bin 0 -> 292680 bytes
 .../SourceSansPro/SourceSansPro-LightItalic.ttf| Bin 0 -> 104156 bytes
 css/fonts/SourceSansPro/SourceSansPro-Regular.ttf  | Bin 0 -> 293516 bytes
 css/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf | Bin 0 -> 291864 bytes
 .../SourceSansPro/SourceSansPro-SemiBoldItalic.ttf | Bin 0 -> 103556 bytes
 css/fonts/SourceSerifPro/OFL.txt   |  93 ++
 css/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf   | Bin 0 -> 113188 bytes
 .../SourceSerifPro/SourceSerifPro-Regular.ttf  | Bin 0 -> 113640 bytes
 .../SourceSerifPro/SourceSerifPro-Semibold.ttf | Bin 0 -> 114352 bytes
 css/layout.css | 100 +-
 css/layout.min.css |   2 +-
 en/banner.wmi  |  16 ++
 en/index.wml   |   4 +-
 es/banner.wmi  |   6 +
 es/index.wml   | 204 +
 es/navigation.wmi  |  29 +++
 images/artwork.png | Bin 0 -> 22387 bytes
 images/artw...@2x.png  | Bin 0 -> 46793 bytes
 34 files changed, 635 insertions(+), 5 deletions(-)

diff --git a/css/fonts/SourceCodePro/OFL.txt b/css/fonts/SourceCodePro/OFL.txt
new file mode 100644
index ..6f4c937e
--- /dev/null
+++ b/css/fonts/SourceCodePro/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with 
Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of 
Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+---
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to 

[tor-commits] [webwml/master] Merge branch 'end-of-year' into staging

2018-10-23 Thread hiro
commit 10e6c8add64566bb8411025c2359c5ec269b864a
Merge: 1e5f4f52 fff3216d
Author: hiro 
Date:   Mon Oct 22 15:11:24 2018 +0200

Merge branch 'end-of-year' into staging

 css/fonts/SourceCodePro/OFL.txt|  93 ++
 css/fonts/SourceCodePro/SourceCodePro-Black.ttf| Bin 0 -> 120356 bytes
 css/fonts/SourceCodePro/SourceCodePro-Bold.ttf | Bin 0 -> 120504 bytes
 .../SourceCodePro/SourceCodePro-ExtraLight.ttf | Bin 0 -> 121568 bytes
 css/fonts/SourceCodePro/SourceCodePro-Light.ttf| Bin 0 -> 121284 bytes
 css/fonts/SourceCodePro/SourceCodePro-Medium.ttf   | Bin 0 -> 120244 bytes
 css/fonts/SourceCodePro/SourceCodePro-Regular.ttf  | Bin 0 -> 120548 bytes
 css/fonts/SourceCodePro/SourceCodePro-Semibold.ttf | Bin 0 -> 120252 bytes
 css/fonts/SourceSansPro/OFL.txt|  93 ++
 css/fonts/SourceSansPro/SourceSansPro-Black.ttf| Bin 0 -> 288824 bytes
 .../SourceSansPro/SourceSansPro-BlackItalic.ttf| Bin 0 -> 102944 bytes
 css/fonts/SourceSansPro/SourceSansPro-Bold.ttf | Bin 0 -> 290916 bytes
 .../SourceSansPro/SourceSansPro-BoldItalic.ttf | Bin 0 -> 103200 bytes
 .../SourceSansPro/SourceSansPro-ExtraLight.ttf | Bin 0 -> 291112 bytes
 .../SourceSansPro-ExtraLightItalic.ttf | Bin 0 -> 104304 bytes
 css/fonts/SourceSansPro/SourceSansPro-Italic.ttf   | Bin 0 -> 103828 bytes
 css/fonts/SourceSansPro/SourceSansPro-Light.ttf| Bin 0 -> 292680 bytes
 .../SourceSansPro/SourceSansPro-LightItalic.ttf| Bin 0 -> 104156 bytes
 css/fonts/SourceSansPro/SourceSansPro-Regular.ttf  | Bin 0 -> 293516 bytes
 css/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf | Bin 0 -> 291864 bytes
 .../SourceSansPro/SourceSansPro-SemiBoldItalic.ttf | Bin 0 -> 103556 bytes
 css/fonts/SourceSerifPro/OFL.txt   |  93 ++
 css/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf   | Bin 0 -> 113188 bytes
 .../SourceSerifPro/SourceSerifPro-Regular.ttf  | Bin 0 -> 113640 bytes
 .../SourceSerifPro/SourceSerifPro-Semibold.ttf | Bin 0 -> 114352 bytes
 css/layout.css | 100 +-
 css/layout.min.css |   2 +-
 en/banner.wmi  |  16 ++
 en/index.wml   |   4 +-
 es/banner.wmi  |   6 +
 es/index.wml   | 204 +
 es/navigation.wmi  |  29 +++
 images/artwork.png | Bin 0 -> 22387 bytes
 images/artw...@2x.png  | Bin 0 -> 46793 bytes
 34 files changed, 635 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Fix css and layout for banner

2018-10-23 Thread hiro
commit 5f24209bb43f9e1592f8ec807ce466b9a4aa7e27
Author: hiro 
Date:   Mon Oct 22 19:47:16 2018 +0200

Fix css and layout for banner
---
 css/layout.css |  48 +++--
 css/layout.min.css | 101 -
 en/banner.wmi  |  24 +++--
 3 files changed, 151 insertions(+), 22 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index e2fddd83..55ae4eae 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -1396,25 +1396,39 @@ p.blogDate {
 }
 
 .eoy-background {
-  background-color: #FF;
+  background-color: #F8F9FA;
   width: 100%;
-  height: 200px;
-  padding-left: 10%;
-  padding-right: 10%;
-   padding-top: 5%;
+  height: 300px;
+   margin-bottom: 35px;
+}
+
+.eoy-wrap {
+   width: 960px;
+  margin: auto;
+  padding-top: 20px;
 }
 
 .eoy-artwork {
width: 40%;
-  background: url(../images/artw...@2x.png) left top no-repeat;
+  background: url(../images/artw...@2x.png) left bottom no-repeat;
   background-size: contain;
   float: left;
-   height: 100%;
+   height: 280px;
 }
 
 .eoy-message {
-   width: 60%;
+   width: 55%;
   float: right;
+   padding-left: 35px;
+}
+
+.advance-universal-hu {
+  color: #420C5D;
+  font-family: Source Sans Pro;
+  font-size: 24px;
+  font-weight: 600;
+  line-height: 29px;
+  text-align: left;
 }
 
 .tor-strength-in-num {
@@ -1426,7 +1440,16 @@ p.blogDate {
   text-align: left;
 }
 
-.tor-strength-in-num > p {
+.give-today-and-mozi {
+  color: #420C5D;
+  font-family: Source Sans Pro;
+  font-size: 13px;
+  font-weight: 400;
+  line-height: 16px;
+  text-align: left;
+}
+
+.tor-strength-in-num > p.title {
text-transform: uppercase;
 }
 
@@ -1436,7 +1459,6 @@ p.blogDate {
   font-size: 24px;
   font-weight: 600;
   line-height: 29px;
-  width: 454px;
   text-align: left;
 }
 
@@ -1455,6 +1477,8 @@ p.blogDate {
   width: 120px;
   height: 35px;
padding: 10px;
+   padding-left: 20px;
+   padding-right: 20px;
 }
 
 .count-me-in {
@@ -1465,3 +1489,7 @@ p.blogDate {
   line-height: 17px;
   text-align: center;
 }
+
+mark {
+  background: cyan;
+}
diff --git a/css/layout.min.css b/css/layout.min.css
index f7007a24..f45df9d1 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -1 +1,100 @@
-@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 
auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo
 a,h1#logo a:visited{background:url(../images/tor-logo.png) left top 
no-repeat;background-size:150px 
97px;text-indent:-px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav
 ul{height:50px;float:right;margin-bottom:0}#nav ul 
li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction
 ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul 
li{list-style:none;display:inline;float:none;width
 :100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li 
a:visited{display:block;background:url(../images/cta-buttons.jpg) top center 
no-repeat #885ca4;padding:4px 
8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px
 1px 0 #111}#calltoaction ul li:hover 
a{background:url(../images/cta-buttons.jpg) bottom center no-repeat 
#ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul 
li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction 
ul li:hover:first-child 
a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction
 ul li:first-child a:link,#calltoaction ul li:first-child 
a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat 
#885ca4}#calltoaction ul li:hover:first-child a{background:url(../images
 /cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child 
a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul 
li:hover:last-child 
a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction
 ul li:last-child a:link,#calltoaction ul li:last-child 
a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat 
#885ca4;color:#fff}#calltoaction ul li:hover:last-child 
a{background:url(../images/cta-buttons.jpg) bottom right no-repeat 

[tor-commits] [webwml/staging] Add link from donate button

2018-10-23 Thread hiro
commit 1b6e15c1b73e7d5cc4246b03b630d1351aef3854
Author: hiro 
Date:   Tue Oct 23 15:36:44 2018 +0200

Add link from donate button
---
 en/banner.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/banner.wmi b/en/banner.wmi
index 17f86568..da044de3 100644
--- a/en/banner.wmi
+++ b/en/banner.wmi
@@ -11,7 +11,7 @@
 Give today, and Mozilla will match 
your donation.
   
   
-Count me in
+https://donate.torproject.org/;>Count me in
   
 
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [policies/master] Add minutes for the 2018-08-20 meeting.

2018-10-23 Thread linus
commit eeb56747947aaceea939d3638176025de93a72fd
Author: Linus Nordberg 
Date:   Tue Oct 23 15:31:08 2018 +0200

Add minutes for the 2018-08-20 meeting.
---
 minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt   | 59 ++
 ...ing_Minutes-2018-08-20.txt.1E8BF34923291265.asc | 16 ++
 2 files changed, 75 insertions(+)

diff --git a/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt 
b/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt
new file mode 100644
index 000..6300472
--- /dev/null
+++ b/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt
@@ -0,0 +1,59 @@
+Tor Project Board Meeting Minutes for August 20, 2018
+
+Phone/Video Meeting called to order at 15:00 UTC
+
+Present: Shari Steele, Matt Blaze, Ramy Raoof, Cindy Cohn, Linus
+Nordberg, Biella Coleman, Nick Mathewson, Julius Mittenzwei, Megan
+Price, and Roger Dingledine
+
+1. Administrivia
+
+– Approval of June 20, 2018 minutes. Julius made the motion, Bruce
+  seconded, all voted in favor.
+
+RESOLVED: minutes from June 20, 2018 approved.
+
+2. Executive Director Transition Overview
+
+– To replace Isabela, two project managers have been hired.
+
+– Isabela will transition around mid-September and Shari will remain
+  as a consultant and join the board.
+
+4. Finances
+
+– Moved to add Isabela Bagueros to the bank account: “The board of
+  directors of the Tor Project, Inc., hereby authorizes Isabela
+  Bagueros to be added as a signatory on the organization's Bank of
+  America checking account #X.” Biella made the motion to add her
+  to the account, Ramy seconded, all voted in favor.
+
+RESOLVED: Incoming Executive Director, Isabela Bagueros added to the
+TPI. Bank of America account.
+
+– Shari explained that the Merrill Lynch cash securities account was
+  closed due to inactivity. She proposed we open it again and include
+  board members who had been previously added before via board vote as
+  signatories (Cindy Cohn and Biella Coleman) and add incoming ED,
+  Isabela Bagueros.
+
+– Cindy made the motion to add Biella Coleman, Isabela Bagueros, and
+  Cindy Cohn as indicated on the on the Merrill Lynch account board
+  book exhibit, Matt seconded, all voted in favor.
+
+– Shari went over grants, budget, pending grants and finances.
+
+– Shari explained that a number of grants still need to be billed and
+  the CFO, Sue Abt is working diligently on this matter and will have
+  more time to work on it once a book keeper is hired.
+
+5. New Board Members
+
+– Cindy and Ramy provided an update about current search for new board
+  members.
+
+6. Mexico Meeting
+
+– Discussion of board meeting logistics and format.
+
+Meeting Adjourned at 16:46 UTC.
diff --git 
a/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt.1E8BF34923291265.asc 
b/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt.1E8BF34923291265.asc
new file mode 100644
index 000..c4903fc
--- /dev/null
+++ b/minutes/TPI_Board_Meeting_Minutes-2018-08-20.txt.1E8BF34923291265.asc
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEjEzVEQlemC6w77+iHovzSSMpEmUFAlvPImEACgkQHovzSSMp
+EmWlqBAArSpggFF72ZWtKt+FI5bY/2UXfrLYZyBhVEG308C5mlsX4lLIZXvyEASh
+vZMvvYlr0aK22z2P5onMkjsTUFMivPU6YU1zUvHyA9XUYLmwly2MXJS2xZyN6ulK
+XmxCVdZ+0uA8E9S/APySlDPOGrG5t/rC2Ha3ke7iwtAh/u7JOT30aBVf4WDKtdvy
+RlHkuv5QKliGA4aB/rDyniWn50e9hnMcVY6UutWmoHCcgHAgYcVHcGrYPoZESHre
+ls7nk+I1H8qscnl0VCnodbCnsGKOBmJMWrun37Y/JPg7UTSiERXxZ3pMiJLUWoWG
+aBy3Por/J0mwKr+ZU48dngOxnLWcoahlNDWul1GmOle8V7XaEDe5scYU2c/HcUAh
+TpsO6uKUmx1Ufwi+EIjxhcNvbu9vbPoHdDIyoNUW8hVMtmroz4rwcvaQxigsYrOy
+ebUSO8b6Kk5tk9nKKy0jpGynP/EKtHNTfmS35VBhPiyIWFh733XD+0sgjBX4MBVm
+ZcrHRtzpSedSgMv/zgW8zxOqVvG54fYlJPy3p5bOca4PFQb+Sq1Y3wh96zyfDmOR
+eeCq6E1QHB2PlVtJditNytPmpkCBEHJLCx5pyyVQ5F5xczM4A2nQPvMkbPTPingK
+IXDp6UaD6Csymc33bsvSI0YHw7ORiXsvyNgoioqxH82TVMnXly8=
+=i316
+-END PGP SIGNATURE-

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit f9c994ed92b0eb37eef9c8c9f27ae87a345a685a
Author: Translation commit bot 
Date:   Tue Oct 23 08:45:20 2018 +

Update translations for donatepages-messagespot
---
 locale/zh_CN/LC_MESSAGES/messages.po | 126 ++-
 1 file changed, 78 insertions(+), 48 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po 
b/locale/zh_CN/LC_MESSAGES/messages.po
index 9667d1c6e..b6d319e39 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -4,10 +4,10 @@
 # Mingye Wang , 2018
 # Chi-Hsun Tsai, 2018
 # ヨイツの賢狼ホロ , 2018
-# MD Rgiths , 2018
+# MD Rights , 2018
 msgid ""
 msgstr ""
-"Last-Translator: MD Rgiths , 2018\n"
+"Last-Translator: MD Rights , 2018\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -458,39 +458,39 @@ msgstr "请为每一件T恤选择适合你的尺ç 
å’Œèº«åž‹ã€‚"
 msgid ""
 "Powering Digital Resistance or Open Observvatory of Network Interference "
 "(OONI) T-Shirt"
-msgstr ""
+msgstr "“壮大数码抵抗”,或 
“网络干预开放观测站(OONI)” T恤"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:457
 msgid "Heart of Internet Freedom T-Shirt"
-msgstr ""
+msgstr "“互联网自由的心脏” T恤"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:461
 msgid "Choose your size."
-msgstr ""
+msgstr "请选择你的尺码"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:465
 msgid "Sweatshirt"
-msgstr ""
+msgstr "卫衣"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:469
 msgid ""
 "A required field is missing from the form.  Please reload the page and try "
 "again."
-msgstr ""
+msgstr "表格中有一必填项没有填。请重新载å…
¥æœ¬é¡µå†è¯•ä¸€è¯•ã€‚"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473
 msgid "There was a problem submitting your request to the server:"
-msgstr ""
+msgstr "您提交给服务器的表格遇到点问题:"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:477
 msgid "validation failed"
-msgstr ""
+msgstr "认证失败"
 
 #. notes: __field_name__ will be replaced with the field name in the
 #. javascript.
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:483
 msgid "__field_name__ must be filled out."
-msgstr ""
+msgstr "__field_name__ 为必填。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488
 msgid "This field is required"
@@ -498,43 +498,43 @@ msgstr "此项必填"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492
 msgid "Invalid email address."
-msgstr ""
+msgstr "不合格的电邮地址。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:505
 msgid "One moment while we shovel coal into our servers."
-msgstr ""
+msgstr "请稍等一会儿,我们正在处理您提交的信息。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:588
 msgid "TOR SAVES LIVES"
-msgstr ""
+msgstr "TOR 可以救命!"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:592
 msgid ""
 "Activists and journalists use the Tor network and software to alert the "
 "world to human rights abuses."
-msgstr ""
+msgstr "社运人士和记者使用 Tor 网络和软件向å…
¨ä¸–界报道人权侵犯案件。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:596
 msgid ""
 "In countries that censor the internet, people use Tor to access critical "
 "resources."
-msgstr ""
+msgstr "在那些审查互联网的国家,人们用 Tor 来访问å…
³é”®çš„资源。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:600
 msgid ""
 "Millions of people rely on Tor every day for a safer, more secure way to "
 "access the internet."
-msgstr ""
+msgstr "上百万人每天依赖 Tor 以更安å…
¨çš„方式来访问互联网。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:605
 msgid ""
 "Your support today will help ensure Tor remains independent, robust, and "
 "secure."
-msgstr ""
+msgstr "你今天的支持将帮助 Tor 保持独立、健壮和安全。"
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34
 msgid "Tor Thanks You"
-msgstr ""
+msgstr "Tor 感谢您"
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:44
 msgid "Thank you!"
@@ -548,43 +548,46 @@ msgid ""
 "browser for 

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-10-23 Thread translation
commit 02fd0e8f740b346827e4cfca0f67befd68cb02d6
Author: Translation commit bot 
Date:   Tue Oct 23 06:49:16 2018 +

Update translations for support-portal
---
 contents+zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh_CN.po b/contents+zh_CN.po
index 32ae03bfd..dd604e35a 100644
--- a/contents+zh_CN.po
+++ b/contents+zh_CN.po
@@ -4071,7 +4071,7 @@ msgstr "搜索"
 
 #: templates/sidenav.html:4 templates/sidenav.html:30
 msgid "Topics"
-msgstr ""
+msgstr "主题"
 
 #: templates/macros/question.html:13
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2018-10-23 Thread translation
commit ec6ab26c481fb105c0faf3535ebc99225779b1c8
Author: Translation commit bot 
Date:   Tue Oct 23 06:49:21 2018 +

Update translations for support-portal_completed
---
 contents+zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh_CN.po b/contents+zh_CN.po
index 32ae03bfd..dd604e35a 100644
--- a/contents+zh_CN.po
+++ b/contents+zh_CN.po
@@ -4071,7 +4071,7 @@ msgstr "搜索"
 
 #: templates/sidenav.html:4 templates/sidenav.html:30
 msgid "Topics"
-msgstr ""
+msgstr "主题"
 
 #: templates/macros/question.html:13
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-10-23 Thread translation
commit 99c97d98e3e58b80bc6fa3bc08679dbd0cd26814
Author: Translation commit bot 
Date:   Tue Oct 23 06:45:21 2018 +

Update translations for donatepages-messagespot
---
 locale/zh_CN/LC_MESSAGES/messages.po | 56 ++--
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po 
b/locale/zh_CN/LC_MESSAGES/messages.po
index f0fa2439f..9667d1c6e 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -306,56 +306,56 @@ msgstr "网络干预开放观测站"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:213
 msgid "t-shirt pack"
-msgstr "T恤包"
+msgstr "T恤"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:222
 msgid ""
 "Our Tor: Powering Digital Resistance or Open Observatory of Network "
 "Interference (OONI) t-shirt, plus our Tor at the Heart of Internet Freedom "
 "t-shirt."
-msgstr ""
+msgstr "我们的 Tor:“壮大数码抵抗” 或 
“网络干预开放观测站(OONI)” T恤,加上我们的 “Tor 
就是网络自由的心脏” T恤。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:243
 msgid "sweatshirt"
-msgstr ""
+msgstr "卫衣"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:250
 msgid ""
 "Your strong support of Tor gets you this high-quality American Apparel zip "
 "hoodie."
-msgstr ""
+msgstr "您对 Tor 
的强力支持可以得到这件高质量美国款拉链卫衣。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:262
 msgid "how do you want to DONATE?"
-msgstr ""
+msgstr "您打算怎样捐款?"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:268
 msgid "Credit Card"
-msgstr ""
+msgstr "信用卡"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:278
 msgid "Your Info"
-msgstr ""
+msgstr "您的信息"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:282
 msgid "* required fields"
-msgstr ""
+msgstr "* 必填"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:287
 msgid "First Name"
-msgstr ""
+msgstr "名"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:291
 msgid "Last Name"
-msgstr ""
+msgstr "姓"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:297
 msgid "Street Address"
-msgstr ""
+msgstr "街道地址"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:301
 msgid "Apt."
-msgstr ""
+msgstr "门牌号"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311
 msgid "City"
@@ -363,11 +363,11 @@ msgstr "城市"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315
 msgid "region"
-msgstr ""
+msgstr "地区"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320
 msgid "Zip"
-msgstr ""
+msgstr "邮编"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:326
 msgid "Enter email"
@@ -375,15 +375,15 @@ msgstr "输入邮箱"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330
 msgid "Well email you your receipt"
-msgstr ""
+msgstr "我们会把收据电邮发给您"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:337
 msgid "Start sending me email updates about the Tor Project!"
-msgstr ""
+msgstr "今后发送关于 Tor Project 的新闻邮件给我!"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:344
 msgid "Card Number"
-msgstr ""
+msgstr "卡号"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351
 msgid "MM"
@@ -391,21 +391,21 @@ msgstr "月"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:355
 msgid "YY"
-msgstr ""
+msgstr "å¹´"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:359
 msgid "CVC"
-msgstr ""
+msgstr "CVC 码"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:367
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:441
 msgid "Choose your size and fit."
-msgstr ""
+msgstr "选择你的尺码和身型。"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:372
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380
 msgid "T-shirt:"
-msgstr ""
+msgstr