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

2018-06-21 Thread translation
commit 36e24d96ee11ca0fbc1f91a388b3594a381b
Author: Translation commit bot 
Date:   Fri Jun 22 06:20:03 2018 +

Update translations for support-topics_completed
---
 tr.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr.json b/tr.json
index e99ead461..9095a32af 100644
--- a/tr.json
+++ b/tr.json
@@ -5,9 +5,9 @@
"label": "Sık Sorulan Sorular"
 },
 "tbb": {
-   "path": "#tortarayici",
-   "control": "tortarayici",
-   "label": "Tor Tarayıcı"
+   "path": "#torbrowser",
+   "control": "torbrowser",
+   "label": "Tor Browser"
 },
 "tormessenger": {
"path": "#tormessenger",

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


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

2018-06-21 Thread translation
commit 3f8abdff6b2b54db01d29e8938096942e57c8b5d
Author: Translation commit bot 
Date:   Fri Jun 22 06:19:58 2018 +

Update translations for support-topics
---
 tr.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr.json b/tr.json
index e99ead461..9095a32af 100644
--- a/tr.json
+++ b/tr.json
@@ -5,9 +5,9 @@
"label": "Sık Sorulan Sorular"
 },
 "tbb": {
-   "path": "#tortarayici",
-   "control": "tortarayici",
-   "label": "Tor Tarayıcı"
+   "path": "#torbrowser",
+   "control": "torbrowser",
+   "label": "Tor Browser"
 },
 "tormessenger": {
"path": "#tormessenger",

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


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

2018-06-21 Thread translation
commit c4abe353de90102eb384ee66723b74e57132dbc1
Author: Translation commit bot 
Date:   Fri Jun 22 06:19:50 2018 +

Update translations for support-tbb
---
 tr.json | 198 
 1 file changed, 99 insertions(+), 99 deletions(-)

diff --git a/tr.json b/tr.json
index 563334650..08b121f2a 100644
--- a/tr.json
+++ b/tr.json
@@ -1,259 +1,259 @@
 {
 "tbb-1": {
-   "id": "#tortarayici-1",
-   "control": "tortarayici-1",
-   "title": "Tor tarayıcısının son kararlı sürümünde en çok 
yaşanan sorunlar nedir?",
-   "description": "Ne zaman Tor tarayıcısının yeni 
sürümünü yayınlarsak,blogumuzda bunun hakkındaki yeni özellikleri ve 
bilinen sorun gibi özellikleri yazarız.Eğer güncellemden sonra Tor 
tarayıcısıyla sorun yaşıyorsanız ve sorununuz listelenmişse en çok 
kullanılan kararlı Tor tarayıcı konusuna https://blog.torproject.org\";>gözatın."
+   "id": "#torbrowser-1",
+   "control": "torbrowser-1",
+   "title": "Son kararlı Tor Browser sürümünde sık görülen sorunlar 
hangileridir?",
+   "description": "Yeni bir Tor Browser yeni sürümü 
yayınladığımızda, yeni özellikler ve bilinen sorunlar üzerine bir blog 
iletisi de yayınlarız. Bir güncellemeden sonra Tor Browser ile sorun 
yaşarsanız, bu durumun bilinen bir sorun olup olmadığını anlamak için 
kullanılan en son kararlı Tor Browser iletisinehttps://blog.torproject.org\";>bakabilirsiniz."
 },
 "tbb-2": {
-   "id": "#tortarayici-2",
-   "control": "tortarayici-2",
+   "id": "#torbrowser-2",
+   "control": "torbrowser-2",
"title": "Neden aktarıcı devresindeki ilk IP Adresi aynı?",
"description": "Bu normal Tor 
davranışıdır.Devrenizdeki ilk aktarım \"giriş koruması\" veya \"koruma\" 
diye isimlendirilir.Bu devrenin daha hızlı ve stabil olmasını sağlar ve 
2-3 ay boyunca bilinen gizlilik saldırılarını engeller.Devre her yeni site 
ziyaretinizde değişir ve bunların hepsi beraber Tor'un tamamen güvenli 
kalma özellikleridir.Aktarıcı koruması nasıl çalışır hakkında bilgi 
almak isterseniz,buhttps://blog.torproject.org/improving-tors-anonymity-changing-guard-parameters\";>blog
 mesajını ve https://www-users.cs.umn.edu/~hoppernj/single_guard.pdf\";>PDF 
dosyasını okuyun."
 },
 "tbb-3": {
-   "id": "#tortarayici-3",
-   "control": "tortarayici-3",
-   "title": "Tor tarayıcı kullandığım zaman,kimse hangi siteleri 
ziyaret ettiğimi söyleyebilecek mi?",
-   "description": "Tor tarayıcısı insanların ziyaret 
ettiğiniz siteleri bilmesini önler.Ama bazı varlıklar,örneğin İnternet 
Hizmet Sağlayıcınız(ISP),Tor kullandığınızı görebilir."
+   "id": "#torbrowser-3",
+   "control": "torbrowser-3",
+   "title": "Tor Browser kullandığımda, herhangi biri hangi siteleri 
ziyaret ettiğimi görebilir mi?",
+   "description": "Tor Browser, ziyaret ettiğiniz 
sitelerin başkaları tarafından görülmesini engeller. Ancak İnternet 
Hizmeti Sağlayıcınız (ISP) gibi bağlantınızdaki bazı,oluşumlar Tor 
kullandığınızı görebilir."
 },
 "tbb-4": {
-   "id": "#tortarayici-4",
-   "control": "tortarayici-4",
-   "title": "Neden Tor Tarayıcısı Firefox üzerine kuruldu ve neden 
diğer tarayıcılar kullanılmadı?",
+   "id": "#torbrowser-4",
+   "control": "torbrowser-4",
+   "title": "Tor Browser neden Firefox üzerine kuruldu ve neden başka 
bir tarayıcı kullanılmadı?",
"description": "Tor Browser, Tor ağı için 
özelleştirilmiş bir Firefox sürümüdür. Tor Browser uygulamasına 
güvenliğiniz ve gizliliğiniz için ek yamalar gibi başka özellikler 
ekledik. Tor ağı başka tarayıcılar ile de kullanılabilir ancak bu durum 
olası saldırı ve bilgi sızıntılarına neden olabilir. Bu nedenle 
genellikle bu yöntemden kaçınıyoruz.https://www.torproject.org/projects/torbrowser/design/\";>Tor Browser 
uygulamasının tasarım özelliklerine buradan bakabilirsiniz."
 },
 "tbb-5": {
-   "id": "#tortarayici-5",
-   "control": "tortarayici-5",
-   "title": "Tor tarayıcısını kullanırken başka bir 
tarayıcı,örneğin Chrome veya Firefox açık kalabilir mi?",
-   "description": "Tor tarayıcı açıkken kesinlikle 
başka tarayıcı açabilirsiniz.Fakat bilmelisiniz ki Tor tarayıcısının 
güvenlik özellikleri başka tarayıcılarda çalışmayacaktır.Tor'dan 
başka tarayıcı veya başka tarayıcıdan Tor'a geçerken dikkatli 
olmalısınız çünkü kazara başka tarayıcıda yapmak istediklerinizi 
Tor'da yapabilirsiniz."
+   "id": "#torbrowser-5",
+   "control": "torbrowser-5",
+   "title": "Tor Browser kullanırken Chrome ya da Firefox gibi başka bir 
tarayıcı da kullanılabilir mi?",
+   "description": "Tor Browser kullanıyorken kesinlikle 
başka bi

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

2018-06-21 Thread translation
commit d08a2a95610dead478a0f61af264c2912dc5fa11
Author: Translation commit bot 
Date:   Fri Jun 22 06:19:21 2018 +

Update translations for support-faq
---
 tr.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.json b/tr.json
index 2a35dd6e2..c4001ee58 100644
--- a/tr.json
+++ b/tr.json
@@ -2,8 +2,8 @@
 "faq-1": {
"id": "#sss-1",
"control": "sss-1",
-   "title": "Tor tarayıcı kullandığım zaman,kimse hangi siteleri 
ziyaret ettiğimi söyleyebilecek mi?",
-   "description": "Tor tarayıcısı insanların ziyaret 
ettiğiniz siteleri bilmesini önler.Ama bazı varlıklar,örneğin İnternet 
Hizmet Sağlayıcınız(ISP),Tor kullandığınızı görebilir."
+   "title": "Tor Browser kullandığımda, herhangi biri hangi siteleri 
ziyaret ettiğimi görebilir mi?",
+   "description": "Tor Browser, ziyaret ettiğiniz 
sitelerin başkaları tarafından görülmesini engeller. Ancak İnternet 
Hizmeti Sağlayıcınız (ISP) gibi bağlantınızdaki bazı,oluşumlar Tor 
kullandığınızı görebilir."
 },
 "faq-2": {
"id": "#sss-2",

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-06-21 Thread translation
commit fb94c95c324004dcf04fb08dbc7b84c6ea17f33d
Author: Translation commit bot 
Date:   Fri Jun 22 06:18:58 2018 +

Update translations for tor-browser-manual
---
 tr/tr.po | 43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index ddf853845..28468fd8e 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -50,7 +50,7 @@ msgid ""
 " will not be able to track your internet activity, including the names and "
 "addresses of the websites you visit."
 msgstr ""
-"İnternet servis sağlayıcınız ya da bağlantınızı yerel olarak 
izleyenler, "
+"İnternet hizmeti sağlayıcınız ya da bağlantınızı yerel olarak 
izleyenler, "
 "İnternet üzerinde yaptığınız işlemleri ve ziyaret ettiğiniz web 
sitelerinin "
 "ad ve adreslerini izleyemez."
 
@@ -208,7 +208,7 @@ msgid ""
 " to the Tor network. Select “Use custom bridges” and enter each bridge "
 "address on a separate line."
 msgstr ""
-"İnternet Servis Sağlayıcınız Tor ağına bağlantıları engelliyorsa, "
+"İnternet Hizmeti Sağlayıcınız Tor ağına bağlantıları engelliyorsa, "
 "sorulduğunda \"Evet\" üzerine tıklayıp \"Özel köprüler kullanılsın\" 
"
 "seçeneğini seçin ve her köprü adresini farklı bir satıra yazın."
 
@@ -302,7 +302,7 @@ msgid ""
 "Select “yes” when asked if your Internet Service Provider blocks 
connections"
 " to the Tor network."
 msgstr ""
-"İnternet Servis Sağlayıcınızın, Tor ağına olan bağlantıları 
engelleyip "
+"İnternet Hizmeti Sağlayıcınızın, Tor ağına olan bağlantıları 
engelleyip "
 "engellemediği sorulduğunda \"Evet\" seçin."
 
 #. This is a reference to an external file such as an image or video. When
@@ -534,7 +534,7 @@ msgstr "Tor Browser ilk kez kullanıldığında neler 
yapmak gerekir"
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
-msgstr "Tor Tarayıcıyı ilk kez çalıştırma"
+msgstr "Tor Browser uygulamasını ilk kez çalıştırma"
 
 #: first-time.page:12
 msgid ""
@@ -894,7 +894,7 @@ msgstr ""
 "Tor Browser sıklıkla bağlantınızı dünyanın tümüyle başka bir 
yerinden "
 "geliyor gibi gösterir. Bankalar ya da e-posta hizmeti sağlayıcıları gibi 
"
 "bazı web siteleri, bu durumu hesabınızın saldırıya uğradığı ya da 
ele "
-"geçirildiği şeklinde yorumlayark hesabınızı kilitleyebilir. Bu durumu "
+"geçirildiği şeklinde yorumlayarak hesabınızı kilitleyebilir. Bu durumu "
 "çözmenin tek yolu, ilgili sitenin hesap kurtarma için önerdiği yöntemi "
 "izlemek ya da müşteri hizmetleri ile görüşerek durumu açıklamaktır."
 
@@ -936,7 +936,7 @@ msgid ""
 "connections. Tor Browser will warn you that all activity and downloads will "
 "be stopped, so take this into account before clicking “New Identity”."
 msgstr ""
-"Bu seçenek, web tarayıcıda yapacağınız işlemlerin daha önce 
yaptığınız "
+"Bu seçenek, web tarayıcısında yapacağınız işlemlerin daha önce 
yaptığınız "
 "işlemler ile bağlantılı olmasını istemediğinizde işe yarar. Bu 
seçenek "
 "kullanıldığında, açık tüm sekmeler ve pencereler kapatılır, çerez 
ve tarama "
 "geçmişi gibi tüm özel bilgiler temizlenir ve tüm bağlantılar için 
yeni Tor "
@@ -1192,8 +1192,8 @@ msgid ""
 "Tor Browser is based on Firefox, and any browser add-ons or themes that are "
 "compatible with Firefox can also be installed in Tor Browser."
 msgstr ""
-"Tor Tarayıcı Firefox tabanlı olduğundan Firefox ile uyumlu tüm eklenti 
ve "
-"temalar Tor Tarayıcı üzerine de yüklenebilir."
+"Tor Browser Firefox tabanlı olduğundan Firefox ile uyumlu tüm eklenti ve "
+"temalar Tor Browser üzerine de kurulabilir."
 
 #: plugins.page:64
 msgid ""
@@ -1204,11 +1204,10 @@ msgid ""
 "ons, and the Tor Project will not offer support for these configurations."
 msgstr ""
 "Bununla birlikte, varsayılan olarak yalnız Tor Browser ile 
kullanılabileceği"
-" denenmiş eklentiler yüklenmiştir. Diğer tarayıcı eklentilerini 
yüklemek, "
-"Tor Browser işlevselliğini bozabilir ya da gizlilik ve güvenliğinizi "
-"etkileyecek daha ciddi sorunlara yol açabilir. Diğer eklentilerin 
yüklenmesi"
-" kesinlikle önerilmez ve Tor Project bu şekildeki yapılandırmalar için "
-"destek sunmaz."
+" denenmiş eklentiler kurulmuştur. Diğer tarayıcı eklentilerini kurmak, 
Tor "
+"Browser işlevselliğini bozabilir ya da gizlilik ve güvenliğinizi 
etkileyecek"
+" daha ciddi sorunlara yol açabilir. Diğer eklentilerin kurulması 
kesinlikle "
+"önerilmez ve Tor Project böyle yapılandırmalar için destek vermez."
 
 #: secure-connections.page:8
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
@@ -1476,7 +1475,7 @@ msgid ""
 "network."
 msgstr ""
 "Takılabilir aktarımlar, Tor tarafından gönderilen veri trafiğinin 
gizlenmesi"
-" için kullanılan araçlardır ve İnternet Servis Sağlayıcısı ya da 
devl

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-06-21 Thread translation
commit 16a7118e2f10be25acebc0099bc6742defec4bbb
Author: Translation commit bot 
Date:   Fri Jun 22 06:19:03 2018 +

Update translations for tor-browser-manual_completed
---
 tr/tr.po | 43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index ddf853845..28468fd8e 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -50,7 +50,7 @@ msgid ""
 " will not be able to track your internet activity, including the names and "
 "addresses of the websites you visit."
 msgstr ""
-"İnternet servis sağlayıcınız ya da bağlantınızı yerel olarak 
izleyenler, "
+"İnternet hizmeti sağlayıcınız ya da bağlantınızı yerel olarak 
izleyenler, "
 "İnternet üzerinde yaptığınız işlemleri ve ziyaret ettiğiniz web 
sitelerinin "
 "ad ve adreslerini izleyemez."
 
@@ -208,7 +208,7 @@ msgid ""
 " to the Tor network. Select “Use custom bridges” and enter each bridge "
 "address on a separate line."
 msgstr ""
-"İnternet Servis Sağlayıcınız Tor ağına bağlantıları engelliyorsa, "
+"İnternet Hizmeti Sağlayıcınız Tor ağına bağlantıları engelliyorsa, "
 "sorulduğunda \"Evet\" üzerine tıklayıp \"Özel köprüler kullanılsın\" 
"
 "seçeneğini seçin ve her köprü adresini farklı bir satıra yazın."
 
@@ -302,7 +302,7 @@ msgid ""
 "Select “yes” when asked if your Internet Service Provider blocks 
connections"
 " to the Tor network."
 msgstr ""
-"İnternet Servis Sağlayıcınızın, Tor ağına olan bağlantıları 
engelleyip "
+"İnternet Hizmeti Sağlayıcınızın, Tor ağına olan bağlantıları 
engelleyip "
 "engellemediği sorulduğunda \"Evet\" seçin."
 
 #. This is a reference to an external file such as an image or video. When
@@ -534,7 +534,7 @@ msgstr "Tor Browser ilk kez kullanıldığında neler 
yapmak gerekir"
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
-msgstr "Tor Tarayıcıyı ilk kez çalıştırma"
+msgstr "Tor Browser uygulamasını ilk kez çalıştırma"
 
 #: first-time.page:12
 msgid ""
@@ -894,7 +894,7 @@ msgstr ""
 "Tor Browser sıklıkla bağlantınızı dünyanın tümüyle başka bir 
yerinden "
 "geliyor gibi gösterir. Bankalar ya da e-posta hizmeti sağlayıcıları gibi 
"
 "bazı web siteleri, bu durumu hesabınızın saldırıya uğradığı ya da 
ele "
-"geçirildiği şeklinde yorumlayark hesabınızı kilitleyebilir. Bu durumu "
+"geçirildiği şeklinde yorumlayarak hesabınızı kilitleyebilir. Bu durumu "
 "çözmenin tek yolu, ilgili sitenin hesap kurtarma için önerdiği yöntemi "
 "izlemek ya da müşteri hizmetleri ile görüşerek durumu açıklamaktır."
 
@@ -936,7 +936,7 @@ msgid ""
 "connections. Tor Browser will warn you that all activity and downloads will "
 "be stopped, so take this into account before clicking “New Identity”."
 msgstr ""
-"Bu seçenek, web tarayıcıda yapacağınız işlemlerin daha önce 
yaptığınız "
+"Bu seçenek, web tarayıcısında yapacağınız işlemlerin daha önce 
yaptığınız "
 "işlemler ile bağlantılı olmasını istemediğinizde işe yarar. Bu 
seçenek "
 "kullanıldığında, açık tüm sekmeler ve pencereler kapatılır, çerez 
ve tarama "
 "geçmişi gibi tüm özel bilgiler temizlenir ve tüm bağlantılar için 
yeni Tor "
@@ -1192,8 +1192,8 @@ msgid ""
 "Tor Browser is based on Firefox, and any browser add-ons or themes that are "
 "compatible with Firefox can also be installed in Tor Browser."
 msgstr ""
-"Tor Tarayıcı Firefox tabanlı olduğundan Firefox ile uyumlu tüm eklenti 
ve "
-"temalar Tor Tarayıcı üzerine de yüklenebilir."
+"Tor Browser Firefox tabanlı olduğundan Firefox ile uyumlu tüm eklenti ve "
+"temalar Tor Browser üzerine de kurulabilir."
 
 #: plugins.page:64
 msgid ""
@@ -1204,11 +1204,10 @@ msgid ""
 "ons, and the Tor Project will not offer support for these configurations."
 msgstr ""
 "Bununla birlikte, varsayılan olarak yalnız Tor Browser ile 
kullanılabileceği"
-" denenmiş eklentiler yüklenmiştir. Diğer tarayıcı eklentilerini 
yüklemek, "
-"Tor Browser işlevselliğini bozabilir ya da gizlilik ve güvenliğinizi "
-"etkileyecek daha ciddi sorunlara yol açabilir. Diğer eklentilerin 
yüklenmesi"
-" kesinlikle önerilmez ve Tor Project bu şekildeki yapılandırmalar için "
-"destek sunmaz."
+" denenmiş eklentiler kurulmuştur. Diğer tarayıcı eklentilerini kurmak, 
Tor "
+"Browser işlevselliğini bozabilir ya da gizlilik ve güvenliğinizi 
etkileyecek"
+" daha ciddi sorunlara yol açabilir. Diğer eklentilerin kurulması 
kesinlikle "
+"önerilmez ve Tor Project böyle yapılandırmalar için destek vermez."
 
 #: secure-connections.page:8
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
@@ -1476,7 +1475,7 @@ msgid ""
 "network."
 msgstr ""
 "Takılabilir aktarımlar, Tor tarafından gönderilen veri trafiğinin 
gizlenmesi"
-" için kullanılan araçlardır ve İnternet Servis Sağlayıcısı y

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

2018-06-21 Thread translation
commit 4640a0c886d9e4af9ff5e349e3f6eb1ece99830d
Author: Translation commit bot 
Date:   Fri Jun 22 06:16:51 2018 +

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

diff --git a/tr.po b/tr.po
index 0b8143fb7..4f6a2d439 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-22 05:14+\n"
+"PO-Revision-Date: 2018-06-22 05:22+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet servis sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
+msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet hizmeti sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"

___
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-06-21 Thread translation
commit 20c6ef132eb3d3cccdef2eabc9b5ec61669cf5e0
Author: Translation commit bot 
Date:   Fri Jun 22 06:16:46 2018 +

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

diff --git a/tr.po b/tr.po
index 0b8143fb7..4f6a2d439 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-22 05:14+\n"
+"PO-Revision-Date: 2018-06-22 05:22+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet servis sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
+msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet hizmeti sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"

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


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

2018-06-21 Thread translation
commit 253107545b1a89abf62cb2b63b02be8632af0ac1
Author: Translation commit bot 
Date:   Fri Jun 22 06:15:05 2018 +

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

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 425fc0c3c..0341671cf 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-06-22 05:13+\n"
+"PO-Revision-Date: 2018-06-22 05:22+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -347,7 +347,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Köprüleri Tor Browser'a eklemek için önce\n%s Tor Browser indirme 
sayfasına %s\ngidip, Tor Browser indirme ve başlatma yönergelerini izleyin."
+msgstr "Tor Browser üzerine köprüler eklemek için\n%s Tor Browser indirme 
sayfasına %s\ngidin ve Tor Browser indirme ve başlatma yönergelerini 
izleyin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151
@@ -361,7 +361,7 @@ msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 
'Ayarla' üzerine tıkla
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
-msgstr "İnternet Servis Sağlayıcınız (ISS) Tor ağına olan 
bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?"
+msgstr "İnternet Hizmeti Sağlayıcınız (ISS) Tor ağına olan 
bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:159

___
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-06-21 Thread translation
commit d72764e78ec9110e770ee0e9cb2071d677c29f5a
Author: Translation commit bot 
Date:   Fri Jun 22 06:15:11 2018 +

Update translations for bridgedb_completed
---
 tr/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 97ebab40f..0341671cf 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-06-22 05:15+\n"
+"PO-Revision-Date: 2018-06-22 05:22+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -361,7 +361,7 @@ msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 
'Ayarla' üzerine tıkla
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
-msgstr "İnternet Servis Sağlayıcınız (ISS) Tor ağına olan 
bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?"
+msgstr "İnternet Hizmeti Sağlayıcınız (ISS) Tor ağına olan 
bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:159

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


[tor-commits] [torbutton/master] Translations update

2018-06-21 Thread gk
commit 1d9b9b9660b34450f68c807e340c6963e1410fb3
Author: Georg Koppen 
Date:   Fri Jun 22 06:11:14 2018 +

Translations update
---
 src/chrome/locale/ar/torbutton.properties|  4 ++
 src/chrome/locale/bn-BD/aboutDialog.dtd  | 19 +++
 src/chrome/locale/bn-BD/aboutTBUpdate.dtd|  6 +++
 src/chrome/locale/bn-BD/aboutTor.dtd | 45 +
 src/chrome/locale/bn-BD/aboutTor.properties  | 20 
 src/chrome/locale/bn-BD/brand.dtd| 15 ++
 src/chrome/locale/bn-BD/brand.properties | 16 ++
 src/chrome/locale/bn-BD/torbutton.dtd| 51 +++
 src/chrome/locale/bn-BD/torbutton.properties | 58 +
 src/chrome/locale/da/torbutton.properties|  4 ++
 src/chrome/locale/de/torbutton.properties|  4 ++
 src/chrome/locale/es/torbutton.properties|  4 ++
 src/chrome/locale/eu/torbutton.dtd   | 22 
 src/chrome/locale/eu/torbutton.properties|  6 ++-
 src/chrome/locale/fa/torbutton.properties|  4 ++
 src/chrome/locale/fr/torbutton.properties|  4 ++
 src/chrome/locale/he/aboutDialog.dtd | 19 +++
 src/chrome/locale/he/aboutTBUpdate.dtd   |  6 +++
 src/chrome/locale/he/aboutTor.dtd| 60 +++---
 src/chrome/locale/he/aboutTor.properties | 19 ---
 src/chrome/locale/he/brand.dtd   | 15 --
 src/chrome/locale/he/brand.properties| 17 ---
 src/chrome/locale/he/torbutton.dtd   | 57 +++--
 src/chrome/locale/he/torbutton.properties| 75 
 src/chrome/locale/it/torbutton.properties|  4 ++
 src/chrome/locale/ja/torbutton.properties|  4 ++
 src/chrome/locale/ko/torbutton.properties|  4 ++
 src/chrome/locale/nl/torbutton.properties|  4 ++
 src/chrome/locale/pl/torbutton.properties|  4 ++
 src/chrome/locale/pt-BR/torbutton.dtd|  4 +-
 src/chrome/locale/pt-BR/torbutton.properties |  4 ++
 src/chrome/locale/ru/aboutTor.properties |  2 +-
 src/chrome/locale/ru/torbutton.dtd   |  2 +-
 src/chrome/locale/ru/torbutton.properties|  4 ++
 src/chrome/locale/sv/torbutton.dtd   |  4 +-
 src/chrome/locale/sv/torbutton.properties|  8 ++-
 src/chrome/locale/tr/aboutTor.dtd|  2 +-
 src/chrome/locale/tr/torbutton.dtd   |  4 +-
 src/chrome/locale/tr/torbutton.properties| 16 +++---
 src/chrome/locale/vi/torbutton.properties|  4 ++
 src/chrome/locale/zh-CN/torbutton.dtd|  2 +-
 src/chrome/locale/zh-CN/torbutton.properties |  8 ++-
 src/chrome/locale/zh-TW/aboutDialog.dtd  | 19 +++
 src/chrome/locale/zh-TW/aboutTBUpdate.dtd|  6 +++
 src/chrome/locale/zh-TW/aboutTor.dtd | 60 +++---
 src/chrome/locale/zh-TW/aboutTor.properties  | 19 ---
 src/chrome/locale/zh-TW/brand.dtd| 15 --
 src/chrome/locale/zh-TW/brand.properties | 17 ---
 src/chrome/locale/zh-TW/torbutton.dtd| 67 ++---
 src/chrome/locale/zh-TW/torbutton.properties | 73 +++
 50 files changed, 702 insertions(+), 208 deletions(-)

diff --git a/src/chrome/locale/ar/torbutton.properties 
b/src/chrome/locale/ar/torbutton.properties
index afa0b93..815004f 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -52,3 +52,7 @@ profileReadOnly=لا يمكنك تشغيل %S من نظام م
لفات خاص ب
 profileReadOnlyMac=لا يمكنك تشغيل %S من نظام ملفات 
خاص بالقراءة فقط.  يرجى نسخ %S إلى سطح المكتب 
أو مجلد التطبيقات قبل محاولة استخدامه.
 profileAccessDenied=لا يمتلك %S الصلاحيات المطلوبة لم
لف إعداداتك. يرجى ضبط صلاحيات نظام الملفات 
ثم إعادة المحاولة.
 profileMigrationFailed=فشل نقل ملف إعدادات %S الموجود 
إلى الإصدارة الجديدة.\nسيستخدم ملف إعدادات 
جديد.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion 
Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
diff --git a/src/chrome/locale/bn-BD/aboutDialog.dtd 
b/src/chrome/locale/bn-BD/aboutDialog.dtd
new file mode 100644
index 000..9af6013
--- /dev/null
+++ b/src/chrome/locale/bn-BD/aboutDialog.dtd
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/locale/bn-BD/aboutTBUpdate.dtd 
b/src/chrome/locale/bn-BD/aboutTBUpdate.dtd
new file mode 100644
index 000..90abe5d
--- /dev/null
+++ b/src/chrome/locale/bn-BD/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd 
b/src/chrome/locale/bn-BD/aboutTor.dtd
new file mode 100644
index 000..f9226bf
--- /dev/null
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@

[tor-commits] [tor-launcher/master] Version bump

2018-06-21 Thread gk
commit 453ad88f6a5e56b9b7362bff522f317bd57707ec
Author: Georg Koppen 
Date:   Fri Jun 22 06:01:08 2018 +

Version bump
---
 src/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index e9ae610..011ab5b 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
 The Tor Project, Inc.
 Pearl Crescent, LLC
 tor-launc...@torproject.org
-0.2.15.2
+0.2.16
 true
 
https://www.torproject.org/projects/torbrowser.html
 data:text/plain,

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


[tor-commits] [tor-launcher/master] Translations update

2018-06-21 Thread gk
commit 769d546086581046448c394eb323bb61a44de1d5
Author: Georg Koppen 
Date:   Fri Jun 22 06:00:02 2018 +

Translations update
---
 src/chrome/locale/ar/network-settings.dtd  | 44 +++---
 src/chrome/locale/ar/torlauncher.properties| 52 +-
 src/chrome/locale/br/torlauncher.properties|  2 +-
 src/chrome/locale/de/network-settings.dtd  |  4 +-
 src/chrome/locale/eu/network-settings.dtd  | 16 
 src/chrome/locale/ms-MY/network-settings.dtd   |  8 ++--
 src/chrome/locale/ms-MY/torlauncher.properties | 24 ++--
 src/chrome/locale/nb/network-settings.dtd  |  4 +-
 src/chrome/locale/nb/torlauncher.properties|  8 ++--
 src/chrome/locale/pl/network-settings.dtd  |  2 +-
 src/chrome/locale/pt/network-settings.dtd  |  2 +-
 src/chrome/locale/ru/network-settings.dtd  |  8 ++--
 src/chrome/locale/ru/torlauncher.properties|  2 +-
 src/chrome/locale/tr/network-settings.dtd  |  6 +--
 src/chrome/locale/tr/torlauncher.properties| 26 ++---
 15 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/src/chrome/locale/ar/network-settings.dtd 
b/src/chrome/locale/ar/network-settings.dtd
index 6b1855a..b06d17d 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -1,7 +1,7 @@
 
-
+
 
-
+
 
 
 
@@ -9,25 +9,25 @@
 
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-
+
 
 
 
 
-
+
 
-
+
 
 
 
@@ -39,24 +39,24 @@
 
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 
 
 
 
-
-
+
+
 
 
-
-
+
+
 
 
-
+
diff --git a/src/chrome/locale/ar/torlauncher.properties 
b/src/chrome/locale/ar/torlauncher.properties
index a0190e7..f66f3e8 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -3,9 +3,9 @@
 
 torlauncher.error_title=مُشغل تور
 
-torlauncher.tor_exited_during_startup=تم إغلاق تور بشكل م
فاجئ. قد يكون هذا بسبب مشكلة في تور نفسه أو 
بسبب برنامج آخر على نظامك أو بسبب مشكلة في 
عتاد جهازك. إلى أن تقوم بإعادة تشغيل تور، 
فإن متصفح تور لن يستطيع الوصول إلى أي موقع. 
إذا استمرت المشكلة، يرجى إرسال نسخة من سجل 
تور إلى فريق الدعم.
-torlauncher.tor_exited=تم إغلاق تور بشكل مفاجئ. قد 
يكون هذا بسبب مشكلة في تور نفسه أو بسبب 
برنامج آخر على نظامك أو بسبب مشكلة في عتاد 
جهازك. إلى أن تقوم بإعادة تشغيل تور، فإن م
تصفح تور لن يستطيع الوصول إلى أي موقع. إذا 
استمرت المشكلة، يرجى إرسال نسخة من سجل تور 
إلى فريق الدعم.
-torlauncher.tor_exited2=اعادة تشغيل تور لا يغلق 
الصفحات.
+torlauncher.tor_exited_during_startup=توقف تور أثناء بدء 
تشغيله. قد يكون هذا بسبب خطأ في ملف إعدادات 
تور، أو مشكلة في تور نفسه أو  برنامج آخر على 
نظامك، أو بسبب مشكلة في عتاد جهازك. بدون 
إصلاح المشكلة الحقيقية وإعادة تشغيل تور لن 
يعمل متصفح تور.
+torlauncher.tor_exited=توقف تور أثناء بدء تشغيله. قد 
يكون هذا بسبب خطأ في ملف إعدادات تور، أو م
شكلة في تور نفسه أو برنامج آخر على نظامك، أو 
بسبب مشكلة في عتاد جهازك. بدون إصلاح الم
شكلة الحقيقية وإعادة تشغيل تور لن يعمل م
تصفح تور. إذا استمرت المشكلة، يرجى إرسال 
نسخة من سجل تور إلى فريق الدعم.
+torlauncher.tor_exited2=إعادة تشغيل تور لا يغلق ألسنة 
المتصفح.
 torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ 
التحكم الخاص بتور.
 torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل.
 torlauncher.tor_control_failed=تعذر التحكم في تور.
@@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S  فشل(%2$S).
 
 torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل 
تور.\n\n%S
 torlauncher.tor_missing=الملف التنفيذي لتور مفقود.
-torlauncher.torrc_missing=الملف torrc مفقود ولم يتم 
إنشاؤه. 
-torlauncher.datadir_missing=دليل البيانات تور غير موجود 
ولا يمكن أن ينشأ.
+torlauncher.torrc_missing=ملف torrc غير موجود وتعذّر 
إنشاؤه. 
+torlauncher.datadir_missing=دليل بيانات تور غير موجود 
وتعذّر إنشاؤه.
 torlauncher.password_hash_missing=فشل في الحصول على كلمة 
المرور المجزأة.
 
 torlauncher.failed_to_get_settings=غير قادر علي جلب 
إعدØ

[tor-commits] [tor-browser-build/master] Bug 26039: /preferences/extension-overrides.js will not be loaded in ESR 60

2018-06-21 Thread gk
commit 4f7417becede4e116eecade1dfad65f67ccbbe8d
Author: Richard Pospesel 
Date:   Tue Jun 19 11:45:29 2018 -0700

Bug 26039: /preferences/extension-overrides.js will not be 
loaded in ESR 60

The infrastructure for loading extension-overrides.js no longer
exists in ESR60, so these prefs had to be moved.

Unfortunately, we can't just dump the contents of extension-overrides.js
into 000-tor-browser.js.  The settings are actually partially built in
tor-browser-build to conditionally include various bridge strings as well
as localization settings.  So, we piggy back off this existing build
process and just append the contents of the partially generated
extension-overrids.js to 000-tor-browser.js.
---
 .../extension-overrides.js |  0
 .../preferences/extension-overrides.js | 63 --
 .../preferences/extension-overrides.js | 63 --
 projects/tor-browser/build | 17 +++---
 4 files changed, 9 insertions(+), 134 deletions(-)

diff --git 
a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
 b/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js
similarity index 100%
rename from 
projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
rename to projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js
diff --git 
a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
 
b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
deleted file mode 100644
index c81a7bf..000
--- 
a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++ /dev/null
@@ -1,63 +0,0 @@
-# Overrides for Extension Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-
-# HTTPS Everywhere Preferences:
-pref("extensions.https_everywhere._observatory.popup_shown", true);
-pref("extensions.https_everywhere.toolbar_hint_shown", true);
-
-# NoScript Preferences:
-pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "[System+Principal] about: 
about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: 
moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed 
about:cache");
-pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor 
chrome: resource: blob: mediasource: moz-extension: moz-safe-about: 
about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor 
chrome: resource: blob: mediasource: moz-extension: moz-safe-about: 
about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.ABE.enabled", false);
-pref("noscript.ABE.notify", false);
-pref("noscript.ABE.wanIpAsLocal", false);
-pref("noscript.confirmUnblock", false);
-pref("noscript.contentBlocker", true);
-pref("noscript.firstRunRedirection", false);
-pref("noscript.global", true);
-pref("noscript.gtemp", "");
-pref("noscript.opacizeObject", 3);
-pref("noscript.forbidWebGL", true);
-pref("noscript.forbidFonts", false);
-pref("noscript.options.tabSelectedIndexes", "5,0,0");
-pref("noscript.policynames", "");
-pref("noscript.secureCookies", true);
-pref("noscript.showAllowPage", false);
-pref("noscript.showBaseDomain", false);
-pref("noscript.showDistrust", false);
-pref("noscript.showRecentlyBlocked", false);
-pref("noscript.showTemp", false);
-pref("noscript.showTempToPerm", false);
-pref("noscript.showUntrusted", false);
-pref("noscript.STS.enabled", false);
-pref("noscript.subscription.lastCheck", -142148139);
-pref("noscript.temp", "");
-pref("noscript.untrusted", "");
-pref("noscript.forbidMedia", false);
-pref("noscript.allowWhitelistUpdates", false);
-pref("noscript.fixLinks", false);
-// Now handled by plugins.click_to_play
-pref("noscript.forbidFlash", false);
-pref("noscript.forbidSilverlight", false);
-pref("noscript.forbidJava", false);
-pref("noscript.forbidPlugins", false);
-// Usability tweaks
-pref("noscript.showPermanent", false);
-pref("noscript.showTempAllowPage", true);
-pref("noscript.showRevokeTemp", true);
-pref("noscript.notify", false);
-pref("noscript.autoReload", true);
-pref("noscript.autoReload.allTabs", false);
-pref("noscript.cascadePermissions", true);
-pref("noscript.restrictSubdocScripting", true);
-pref("noscript.showVolatilePrivatePermissionsToggle", false);
-pref("noscript.volatilePrivatePermissions", true);
-pref("noscript.clearClick", 0);
-
-# PDF.js
-// needs to be a user_pref because pdf.js blows away non-user prefs with its 
own
-// defaults each time
-user_pref("pdfjs.disableRange", true);
diff --git 
a/projects/tor-browser/Bundle-Data/windows/Data/Browser/prof

[tor-commits] [tor-browser-build/master] Bug 20628: Add locales bn-BD, da, he, sv-SE, zh-TW

2018-06-21 Thread gk
commit 7ccafbcff04c11b352dc31081be06bc68f49ad60
Author: Arthur Edelstein 
Date:   Thu Jun 21 00:59:11 2018 -0700

Bug 20628: Add locales bn-BD, da, he, sv-SE, zh-TW
---
 rbm.conf | 5 +
 1 file changed, 5 insertions(+)

diff --git a/rbm.conf b/rbm.conf
index de5102d..f283b19 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -52,10 +52,13 @@ var:
   locale_ja: ja
   locales:
 - ar
+- bn-BD
+- da
 - de
 - es-ES
 - fa
 - fr
+- he
 - it
 - '[% c("var/locale_ja") %]'
 - ko
@@ -63,9 +66,11 @@ var:
 - pl
 - pt-BR
 - ru
+- sv-SE
 - tr
 - vi
 - zh-CN
+- zh-TW
 
   sign_build: '[% ENV.RBM_SIGN_BUILD %]'
   sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'



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


[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'arthur/20628+1'

2018-06-21 Thread gk
commit b39dad476f870b60d7008c1e22e477dc80875c38
Merge: 6402ea6 7ccafbc
Author: Georg Koppen 
Date:   Fri Jun 22 05:30:07 2018 +

Merge remote-tracking branch 'arthur/20628+1'

 rbm.conf | 5 +
 1 file changed, 5 insertions(+)

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


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

2018-06-21 Thread translation
commit 45588c64acc754744d9d9e34f74bf1b2c0c324f3
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:52 2018 +

Update translations for support-https_completed
---
 tr.json | 8 
 1 file changed, 8 insertions(+)

diff --git a/tr.json b/tr.json
new file mode 100644
index 0..e9ea07439
--- /dev/null
+++ b/tr.json
@@ -0,0 +1,8 @@
+{
+"https-1": {
+   "id": "#https-1",
+   "control": "https-1",
+   "title": "Tor kullandığımda beni izleyen kişi ya da kuruluşlar web 
siteleri ile paylaştığım oturum açma bilgilerimi ya da formlar üzerine 
yazdığım bilgileri görebilir mi?",
+   "description": "Tor uygulaması sizi izleyebilecek 
kişi ya da kuruluşların hangi siteleri ziyaret ettiğinizi öğrenmesini 
engeller. Bununla birlikte normal HTTP bağlantıları kullanarak İnternet 
üzerinden gönderilen şifrelenmemiş bilgiler, aktarıcı işletmecisinin 
çıkışında ya da kullandığınız çıkış aktarıcısı ile 
hedeflediğiniz web sitesi arasındaki veri trafiğini gözetleyen biri 
tarafından elde edebilir. Hedef siteniz HTTPS kullanıyorsa çıkış 
aktarıcınızdan çıkan  veriler şifrelenmiş olacağından sizi 
izleyebilecek kişi ya da kuruluşlar tarafından görülemez.HTTPS kullanılıyorsa web sitesi 
adresinin başında \"https://\"; bulunur.Tor Browser ve HTTPS 
şifrelemesinin bulunduğu ve bulunmadığı durumlarda sizi izleyebilecek 
kişi ya da kuruluşların hangi bilgilere erişebileceğini bu şemada 
görebilirsiniz."
+}
+}

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


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

2018-06-21 Thread translation
commit bbf14f1f364ed2e7629c32217d0156e5631ff247
Author: Translation commit bot 
Date:   Fri Jun 22 05:20:04 2018 +

Update translations for support-tbb
---
 tr.json | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr.json b/tr.json
index 1cbf76181..563334650 100644
--- a/tr.json
+++ b/tr.json
@@ -21,7 +21,7 @@
"id": "#tortarayici-4",
"control": "tortarayici-4",
"title": "Neden Tor Tarayıcısı Firefox üzerine kuruldu ve neden 
diğer tarayıcılar kullanılmadı?",
-   "description": "Tor tarayıcısı Tor için 
özelleştirilmiş bir Firefox sürümüdür.Bir çok şeyi Tor tarayıcısına 
yerleştirdik;güvenliğiniz ve gizliliğiniz için ek yamalar gibi.Ayrıca 
Tor'u başka tarayıcılarda kullanmak mümkündür ama bu sizi potansiyel 
saldırı ve bilgi sızıntılarına sebeb olabilir.Bu yüzden bundan 
sıklıkla kaçınıyoruz.https://www.torproject.org/projects/torbrowser/design/\";>Tor 
Tarayıcısının yapısı hakkında daha çok şey öğrenin."
+   "description": "Tor Browser, Tor ağı için 
özelleştirilmiş bir Firefox sürümüdür. Tor Browser uygulamasına 
güvenliğiniz ve gizliliğiniz için ek yamalar gibi başka özellikler 
ekledik. Tor ağı başka tarayıcılar ile de kullanılabilir ancak bu durum 
olası saldırı ve bilgi sızıntılarına neden olabilir. Bu nedenle 
genellikle bu yöntemden kaçınıyoruz.https://www.torproject.org/projects/torbrowser/design/\";>Tor Browser 
uygulamasının tasarım özelliklerine buradan bakabilirsiniz."
 },
 "tbb-5": {
"id": "#tortarayici-5",
@@ -50,7 +50,7 @@
 "tbb-8": {
"id": "#tortarayici-8",
"control": "tortarayici-8",
-   "title": "Websitemiz bir sensör tarafından bloklanmıştır. Tor 
Browser kullanıcılara sitemize ereşebilmeleri için yardım edebilir mi?",
+   "title": "Sitemiz bir sansürleyici tarafından engelleniyor. Tor 
Browser kullanıcıların sitemize erişmelerine yardımcı olur mu?",
"description": "Tor Browser can certainly help people 
access your website in places where it is blocked. Most of the time, simply 
downloading the ​https://www.torproject.org/download/download-easy.html.en\";>Tor 
Browser and then using it to navigate to the blocked site will allow 
access. In places where there is heavy censorship we have a number of 
censorship circumvention options available, including ​https://www.torproject.org/docs/pluggable-transports.html.en\";>pluggable 
transports. For more information, please see the https://tb-manual.torproject.org/en-US/\";>​Tor Browser User 
Manual section on https://tb-manual.torproject.org/en-US/circumvention.html\";>censorship."
 },
 "tbb-9": {
@@ -116,14 +116,14 @@
 "tbb-19": {
"id": "#tortarayici-19",
"control": "tortarayici-19",
-   "title": "Tor Browser' a bağlanamıyorum. Bağlantım sıkıntılı 
mı?\n",
+   "title": "Tor Browser uygulamasına bağlanamıyorum. Bağlantım mı 
sorunlu?",
"description": "You might be on a censored network, 
and so you should try using bridges. Some bridges are built in to Tor Browser, 
and you can use those bridges by choosing \"configure\" (then following the 
prompts) in the Tor Launcher window that pops up when you open Tor Browser for 
the first time. If you need other bridges, you can get them at our ​https://bridges.torproject.org/\";>Bridges website. For more 
information about bridges, see the https://tb-manual.torproject.org/en-US/bridges.html\";>​Tor Browser 
manual."
 },
 "tbb-20": {
"id": "#tortarayici-20",
"control": "tortarayici-20",
-   "title": "Tor Browser bağlanamayacak, fakat sansür ile alakalı bir 
sorun gibi görünmüyor.",
-   "description": "Tor Browser'ın bağlantı 
hatalarına yok açan en büyük sorunlardan biri yanlış sistem saati. 
Lütfen sistem saatiniz ve saat diliminizin doğru ayarlandığından emin 
olun. Eğer bu probleminizi çözmezse, Sorun Giderme sayfasınahttps://tb-manual.torproject.org/en-US/bridges.html\";>Tor Browser 
Kılavuzu sayfasından ulaşın."
+   "title": "Tor Browser bağlantı kuramıyor ancak bu sorun sansür ile 
ilgili gibi görünmüyor.",
+   "description": "Tor Browser üzerinde bağlantı 
sorunlarına yol açan en büyük sorunlardan biri sistem saatinin yanlış 
olmasıdır. Lütfen sistem saati ve saat diliminin doğru ayarlandığından 
emin olun. Sorun çözülmezse, https://tb-manual.torproject.org/en-US/bridges.html\";>Tor Browser 
Kılavuzu üzerindeki Sorun Giderme bölümüne bakabilirsiniz."
 },
 "tbb-21": {
"id": "#tortarayici-21",

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


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

2018-06-21 Thread translation
commit 48b6c7371010d8d5f26d081861f5bb36c3e678c3
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:18 2018 +

Update translations for support-censorship
---
 tr.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.json b/tr.json
index 029781ebf..cb22ae92e 100644
--- a/tr.json
+++ b/tr.json
@@ -2,7 +2,7 @@
 "censorship-1": {
"id": "#sansur-1",
"control": "sansur-1",
-   "title": "Sitemiz bir denetçi tarafından engellenmiştir. Tor Browser 
sitemize erişebilmeleri için kullanıcılara yardım etsin mi?",
+   "title": "Sitemiz bir sansürleyici tarafından engelleniyor. Tor 
Browser kullanıcıların sitemize erişmelerine yardımcı olur mu?",
"description": "Tor Browser can certainly help people 
access your website in places where it is blocked. Most of the time, simply 
downloading the ​https://www.torproject.org/download/download-easy.html.en\";>Tor 
Browser and then using it to navigate to the blocked site will allow 
access. In places where there is heavy censorship we have a number of 
censorship circumvention options available, including ​https://www.torproject.org/docs/pluggable-transports.html.en\";>pluggable 
transports. For more information, please see the https://tb-manual.torproject.org/en-US/\";>​Tor Browser User 
Manual section on https://tb-manual.torproject.org/en-US/circumvention.html\";>censorship."
 },
 "censorship-2": {
@@ -32,7 +32,7 @@
 "censorship-6": {
"id": "#sansur-6",
"control": "sansur-6",
-   "title": "Tor Browser' a bağlanamıyorum. Bağlantım sıkıntılı 
mı?\n",
+   "title": "Tor Browser uygulamasına bağlanamıyorum. Bağlantım mı 
sorunlu?\n",
"description": "You might be on a censored network, 
and so you should try using bridges. Some bridges are built in to Tor Browser, 
and you can use those bridges by choosing \"configure\" (then following the 
prompts) in the Tor Launcher window that pops up when you open Tor Browser for 
the first time. If you need other bridges, you can get them at our ​https://bridges.torproject.org/\";>Bridges website. For more 
information about bridges, see the https://tb-manual.torproject.org/en-US/bridges.html\";>​Tor Browser 
manual."
 }
 

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


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

2018-06-21 Thread translation
commit 8b8589449e422b37d18d192f55d48295433662db
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:34 2018 +

Update translations for support-faq
---
 tr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.json b/tr.json
index 67600d0dd..2a35dd6e2 100644
--- a/tr.json
+++ b/tr.json
@@ -8,7 +8,7 @@
 "faq-2": {
"id": "#sss-2",
"control": "sss-2",
-   "title": "Websitemiz bir sensör tarafından bloklanmıştır. Tor 
Browser kullanıcılara sitemize ereşebilmeleri için yardım edebilir mi?",
+   "title": "Sitemiz bir sansürleyici tarafından engelleniyor. Tor 
Browser kullanıcıların sitemize erişmelerine yardımcı olur mu?",
"description": "Tor Browser can certainly help people 
access your website in places where it is blocked. Most of the time, simply 
downloading the ​Tor Browser and then using it to navigate to the blocked 
site will allow access. In places where there is heavy censorship, we have a 
number of censorship circumvention options available, including ​pluggable 
transports. For more information, please see the ​Tor Browser User Manual 
section on censorship."
 },
 "faq-3": {

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


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

2018-06-21 Thread translation
commit 39fb4ff2c130f90a6f3c23856ce5e265cb4d1d85
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:48 2018 +

Update translations for support-https
---
 tr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.json b/tr.json
index 777a027fc..e9ea07439 100644
--- a/tr.json
+++ b/tr.json
@@ -3,6 +3,6 @@
"id": "#https-1",
"control": "https-1",
"title": "Tor kullandığımda beni izleyen kişi ya da kuruluşlar web 
siteleri ile paylaştığım oturum açma bilgilerimi ya da formlar üzerine 
yazdığım bilgileri görebilir mi?",
-   "description": "Tor protects eavesdroppers from 
learning sites that you visit. However, information sent unencrypted over the 
internet using plain HTTP can still be intercepted by exit relay operators or 
anyone observing the traffic between your exit relay and your destination 
website. If the site you are visiting uses HTTPS, then the traffic leaving your 
exit relay will be encrypted, and won't be visible to eavesdroppers.If you are using HTTPS, your 
website URL will begin with \"​https://\";.This visualization shows what information is visible to 
eavesdroppers with and without Tor Br
 owser and HTTPS encryption."
+   "description": "Tor uygulaması sizi izleyebilecek 
kişi ya da kuruluşların hangi siteleri ziyaret ettiğinizi öğrenmesini 
engeller. Bununla birlikte normal HTTP bağlantıları kullanarak İnternet 
üzerinden gönderilen şifrelenmemiş bilgiler, aktarıcı işletmecisinin 
çıkışında ya da kullandığınız çıkış aktarıcısı ile 
hedeflediğiniz web sitesi arasındaki veri trafiğini gözetleyen biri 
tarafından elde edebilir. Hedef siteniz HTTPS kullanıyorsa çıkış 
aktarıcınızdan çıkan  veriler şifrelenmiş olacağından sizi 
izleyebilecek kişi ya da kuruluşlar tarafından görülemez.HTTPS kullanılıyorsa web sitesi 
adresinin başında \"https://\"; bulunur.Tor Browser ve HTTPS 
şifrelemesinin bulunduğu ve bulunmadığı durumlarda sizi izleyebilecek 
kişi ya da kuruluşların hangi bilgilere erişebileceğini bu şemada 
görebilirsiniz."
 }
 }

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


[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-06-21 Thread translation
commit 85c22b085f28a47152e7c3b36b1280aeb06ecd30
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:14 2018 +

Update translations for tor-browser-manual_completed
---
 tr/tr.po | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 94cdb1b92..ddf853845 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -29,8 +29,8 @@ msgstr "Çeviriye Katkıda Bulunanlar"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"Gizliliğimizi ve İnternet üzerindeki kimliğinizin Tor Browser tarafından 
"
-"nasıl korunabileceğini öğrenin"
+"Tor Browser tarafından kişisel verilerinizin gizliliğinin ve İnternet "
+"üzerinde anonim kalmanızın nasıl sağlanabileceğini öğrenin"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
@@ -41,8 +41,8 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
-"Tor Browser kişisel gizliliğinizi ve ağ üzerinde adsız kalmanızı 
sağlamak "
-"için Tor ağını kullanılır. Tor ağı kullanmanın iki ana amacı 
vardır:"
+"Tor Browser kişisel gizliliğinizi ve ağ üzerinde anonim kalmanızı 
sağlamak "
+"için Tor ağını kullanır. Tor ağı kullanmanın iki temel amacı 
vardır:"
 
 #: about-tor-browser.page:18
 msgid ""
@@ -255,9 +255,9 @@ msgid ""
 "page for more information on the types of transport that are currently "
 "available."
 msgstr ""
-"Tor ağına doğrudan erişim, bazen Internet Servis Sağlayıcınız ya da 
hükümet "
-"tarafından engellenebilir. Tor Browser uygulamasında bu engellemeleri 
aşmak "
-"için bazı araçlar bulunur. Bu araçlara \"takılabilir aktarımlar\" 
denir. "
+"Tor ağına doğrudan erişim, bazen Internet Hizmeti Sağlayıcınız ya da 
hükümet"
+" tarafından engellenebilir. Tor Browser uygulamasında bu engellemeleri 
aşmak"
+" için bazı araçlar bulunur. Bu araçlara \"takılabilir aktarımlar\" 
denir. "
 "Kullanılabilecek ulaşım aktarım türleri hakkında ayrıntılı bilgi 
almak için "
 " Takılabilir Aktarımlar  bölümüne 
bakın."
 
@@ -530,7 +530,7 @@ msgstr ""
 
 #: first-time.page:7
 msgid "Learn how to use Tor Browser for the first time"
-msgstr "Tor Browser ilk kez nasıl kullanılır"
+msgstr "Tor Browser ilk kez kullanıldığında neler yapmak gerekir"
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
@@ -779,11 +779,11 @@ msgid ""
 " Browser includes some additional features that help you control what "
 "information can be tied to your identity."
 msgstr ""
-"Tor ağını kullandığınızda, ağı izleyenler sizin konumunuzu ve IP 
adresinizi "
-"tam olarak bilemez. Ancak bu bilgiler olmadan da farklı alanlarda 
yaptığınız"
-" işlemlere bakarak bunları birbiriyle ilişkilendirebilirler. Bu nedenle 
Tor "
-"Browser, kimliğinize hangi bilgilerin eklenebileceğini denetlemenizi "
-"sağlayan bazı ek özellikler içerir."
+"Tor ağını kullandığınızda, ağı izleyen kişi ya da kuruluşlar sizin 
"
+"konumunuzu ve IP adresinizi tam olarak bilemez. Ancak bu bilgiler olmadan da"
+" farklı alanlarda yaptığınız işlemlere bakarak bunları birbiriyle "
+"ilişkilendirebilir. Bu nedenle Tor Browser, kimliğinize hangi bilgilerin "
+"eklenebileceğini denetlemenizi sağlayan bazı ek özellikler içerir."
 
 #: managing-identities.page:29
 msgid "The URL bar"
@@ -1228,11 +1228,11 @@ msgid ""
 "will begin with “https://”, rather than “http://”.";
 msgstr ""
 "Oturum açma parolası gibi kişisel bilgiler şifrelenmemiş olarak 
Ä°nternet "
-"üzerine gönderilirse, ağı izleyen bir kişi ya da kuruluş tarafından 
kolayca "
-"elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu 
"
-"tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız 
"
-"gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız şifreli 
ise, "
-"adresin başında \"http://\"; yerine \"https://\"; bulunur."
+"üzerine gönderilirse, ağı izleyebilecek bir kişi ya da kuruluş 
tarafından "
+"kolayca elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, "
+"sitenin bu tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan 
emin "
+"olmanız gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız 
şifreli "
+"ise, adresin başında \"http://\"; yerine \"https://\"; bulunur."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1252,9 +1252,9 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
-"Aşağıda, ağı izleyen kişi ya da kuruluşların Tor Browser ve HTTPS "
-"şifrelemesinin kullanıldığı ve kullanılmadığı durumlarda

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-06-21 Thread translation
commit 214d35bb074e9faa0b6439c69a481f11cfb3818d
Author: Translation commit bot 
Date:   Fri Jun 22 05:19:09 2018 +

Update translations for tor-browser-manual
---
 tr/tr.po | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 94cdb1b92..ddf853845 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -29,8 +29,8 @@ msgstr "Çeviriye Katkıda Bulunanlar"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"Gizliliğimizi ve İnternet üzerindeki kimliğinizin Tor Browser tarafından 
"
-"nasıl korunabileceğini öğrenin"
+"Tor Browser tarafından kişisel verilerinizin gizliliğinin ve İnternet "
+"üzerinde anonim kalmanızın nasıl sağlanabileceğini öğrenin"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
@@ -41,8 +41,8 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
-"Tor Browser kişisel gizliliğinizi ve ağ üzerinde adsız kalmanızı 
sağlamak "
-"için Tor ağını kullanılır. Tor ağı kullanmanın iki ana amacı 
vardır:"
+"Tor Browser kişisel gizliliğinizi ve ağ üzerinde anonim kalmanızı 
sağlamak "
+"için Tor ağını kullanır. Tor ağı kullanmanın iki temel amacı 
vardır:"
 
 #: about-tor-browser.page:18
 msgid ""
@@ -255,9 +255,9 @@ msgid ""
 "page for more information on the types of transport that are currently "
 "available."
 msgstr ""
-"Tor ağına doğrudan erişim, bazen Internet Servis Sağlayıcınız ya da 
hükümet "
-"tarafından engellenebilir. Tor Browser uygulamasında bu engellemeleri 
aşmak "
-"için bazı araçlar bulunur. Bu araçlara \"takılabilir aktarımlar\" 
denir. "
+"Tor ağına doğrudan erişim, bazen Internet Hizmeti Sağlayıcınız ya da 
hükümet"
+" tarafından engellenebilir. Tor Browser uygulamasında bu engellemeleri 
aşmak"
+" için bazı araçlar bulunur. Bu araçlara \"takılabilir aktarımlar\" 
denir. "
 "Kullanılabilecek ulaşım aktarım türleri hakkında ayrıntılı bilgi 
almak için "
 " Takılabilir Aktarımlar  bölümüne 
bakın."
 
@@ -530,7 +530,7 @@ msgstr ""
 
 #: first-time.page:7
 msgid "Learn how to use Tor Browser for the first time"
-msgstr "Tor Browser ilk kez nasıl kullanılır"
+msgstr "Tor Browser ilk kez kullanıldığında neler yapmak gerekir"
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
@@ -779,11 +779,11 @@ msgid ""
 " Browser includes some additional features that help you control what "
 "information can be tied to your identity."
 msgstr ""
-"Tor ağını kullandığınızda, ağı izleyenler sizin konumunuzu ve IP 
adresinizi "
-"tam olarak bilemez. Ancak bu bilgiler olmadan da farklı alanlarda 
yaptığınız"
-" işlemlere bakarak bunları birbiriyle ilişkilendirebilirler. Bu nedenle 
Tor "
-"Browser, kimliğinize hangi bilgilerin eklenebileceğini denetlemenizi "
-"sağlayan bazı ek özellikler içerir."
+"Tor ağını kullandığınızda, ağı izleyen kişi ya da kuruluşlar sizin 
"
+"konumunuzu ve IP adresinizi tam olarak bilemez. Ancak bu bilgiler olmadan da"
+" farklı alanlarda yaptığınız işlemlere bakarak bunları birbiriyle "
+"ilişkilendirebilir. Bu nedenle Tor Browser, kimliğinize hangi bilgilerin "
+"eklenebileceğini denetlemenizi sağlayan bazı ek özellikler içerir."
 
 #: managing-identities.page:29
 msgid "The URL bar"
@@ -1228,11 +1228,11 @@ msgid ""
 "will begin with “https://”, rather than “http://”.";
 msgstr ""
 "Oturum açma parolası gibi kişisel bilgiler şifrelenmemiş olarak 
Ä°nternet "
-"üzerine gönderilirse, ağı izleyen bir kişi ya da kuruluş tarafından 
kolayca "
-"elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu 
"
-"tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız 
"
-"gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız şifreli 
ise, "
-"adresin başında \"http://\"; yerine \"https://\"; bulunur."
+"üzerine gönderilirse, ağı izleyebilecek bir kişi ya da kuruluş 
tarafından "
+"kolayca elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, "
+"sitenin bu tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan 
emin "
+"olmanız gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız 
şifreli "
+"ise, adresin başında \"http://\"; yerine \"https://\"; bulunur."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1252,9 +1252,9 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
-"Aşağıda, ağı izleyen kişi ya da kuruluşların Tor Browser ve HTTPS "
-"şifrelemesinin kullanıldığı ve kullanılmadığı durumlarda elde 
ede

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

2018-06-21 Thread translation
commit 291e447df0a3b5e09b565be0ec1a945691d1e6db
Author: Translation commit bot 
Date:   Fri Jun 22 05:18:12 2018 +

Update translations for tor_animation_completed
---
 tr.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.srt b/tr.srt
index a361df28c..0d7e855b2 100644
--- a/tr.srt
+++ b/tr.srt
@@ -55,8 +55,8 @@ Tabii, Tor kullanmıyorsanız!
 
 13
 00:00:37,140 --> 00:00:40,840
-Tor Browser gizliliğimizi ve İnternet
-üzerindeki kimliğimizi korur.
+Tor Browser kişisel verilerimizin gizliliğini ve
+İnternet üzerinde anonim kalmamızı sağlar.
 
 14
 00:00:41,560 --> 00:00:44,760

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


[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2018-06-21 Thread translation
commit f44316d3d026de86204f09f7d43ecb896bd397b1
Author: Translation commit bot 
Date:   Fri Jun 22 05:17:58 2018 +

Update translations for tor-and-https
---
 tr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr.po b/tr.po
index 5fc8d5f81..a98b8f70e 100644
--- a/tr.po
+++ b/tr.po
@@ -2,7 +2,7 @@
 # Translators:
 # Bullgeschichte , 2015
 # Idil Yuksel , 2014
-# Kaya Zeren , 2015
+# Kaya Zeren , 2015,2018
 # Ozancan Karataş , 2015
 # Idil Yuksel , 2014
 # Volkan Gezer , 2014
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2017-09-23 19:52+\n"
+"PO-Revision-Date: 2018-06-22 04:55+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -132,7 +132,7 @@ msgstr "İnternet bağlantısı"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Eavesdropping"
-msgstr "Veri izlemesi"
+msgstr "Verilerin izlemesi"
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363

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


[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2018-06-21 Thread translation
commit f97463b46943220816e75bc43ba8c2c0e3c0a007
Author: Translation commit bot 
Date:   Fri Jun 22 05:18:03 2018 +

Update translations for tor-and-https_completed
---
 tr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr.po b/tr.po
index 5fc8d5f81..a98b8f70e 100644
--- a/tr.po
+++ b/tr.po
@@ -2,7 +2,7 @@
 # Translators:
 # Bullgeschichte , 2015
 # Idil Yuksel , 2014
-# Kaya Zeren , 2015
+# Kaya Zeren , 2015,2018
 # Ozancan Karataş , 2015
 # Idil Yuksel , 2014
 # Volkan Gezer , 2014
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2017-09-23 19:52+\n"
+"PO-Revision-Date: 2018-06-22 04:55+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -132,7 +132,7 @@ msgstr "İnternet bağlantısı"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Eavesdropping"
-msgstr "Veri izlemesi"
+msgstr "Verilerin izlemesi"
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363

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


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

2018-06-21 Thread translation
commit 9def4b73246f15a97b7382fca62f69d20c9956ab
Author: Translation commit bot 
Date:   Fri Jun 22 05:18:07 2018 +

Update translations for tor_animation
---
 tr.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr.srt b/tr.srt
index a361df28c..0d7e855b2 100644
--- a/tr.srt
+++ b/tr.srt
@@ -55,8 +55,8 @@ Tabii, Tor kullanmıyorsanız!
 
 13
 00:00:37,140 --> 00:00:40,840
-Tor Browser gizliliğimizi ve İnternet
-üzerindeki kimliğimizi korur.
+Tor Browser kişisel verilerimizin gizliliğini ve
+İnternet üzerinde anonim kalmamızı sağlar.
 
 14
 00:00:41,560 --> 00:00:44,760

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


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

2018-06-21 Thread translation
commit 026db3d3c06a4081c5573e2ce7ee6f24eb48559b
Author: Translation commit bot 
Date:   Fri Jun 22 05:17:31 2018 +

Update translations for torbutton-torbuttonproperties_completed
---
 tr/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index 4317fff50..3554ebb06 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -22,9 +22,9 @@ torbutton.popup.launch = Dosyayı indir
 torbutton.popup.cancel = Ä°ptal\n
 torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
 torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton 
sayfaların İngilizce sürümlerini göstermeyi isteyebilir. Bu özellik, web 
sayfalarının ana diliniz yerine İngilizce görüntülenmesine neden 
olabilir.\n\nDaha iyi gizlilik için web sayfalarının İngilizce 
sürümlerinin görüntülenmesini ister misiniz?
-torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik 
sağlayamadı. Tor Denetim Kapısına giriş yapılamıyor.\n\nTor Browser 
Bundle yazılımını çalıştırdığınıza emin olun.
+torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik 
sağlayamadı. Tor Denetim Kapısına giriş yapılamıyor.\n\nTor Browser 
Bundle uygulamasını çalıştırdığınızdan emin olun.
 torbutton.title.prompt_torbrowser = Önemli Torbutton Bilgisi
-torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: 
artık kapatamıyorsunuz.\n\nBu değişikliği yapmamızın nedeni Tor-Dışı 
kullanılan bir tarayıcıda Torbutton kullanmanın güvenli olmaması. Başka 
türlü çözemeyeceğimiz birçok hata vardı.\n\nFirefox tarayıcısını 
normal olarak kullanmak istiyorsanız, Torbutton yazılımını kaldırıp Tor 
Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri 
normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine 
göre çok daha üstündür.\n\nTorbutton yazılımını kaldırmak için, 
Araçlar->Eklentiler->Uzantılar bölümüne gidin ve Torbutton yazılımının 
yanındaki Kaldır düğmesine tıklayın.
+torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: 
artık kapatamıyorsunuz.\n\nBu değişikliği yapmamızın nedeni Tor 
dışında kullanılan başka bir tarayıcıda Torbutton kullanmanın güvenli 
olmaması. Başka türlü çözemeyeceğimiz birçok sorun vardı.\n\nFirefox 
tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton 
yazılımını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor 
Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton 
ile kullanan Firefox ikilisine göre çok daha üstündür.\n\nTorbutton 
yazılımını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölümüne 
gidin ve Torbutton yazılımının yanındaki Kaldır düğmesine tıklayın.
 torbutton.popup.short_torbrowser = Önemli Torbutton Bilgisi!\n\nTorbutton 
artık kapatılamayacak şekilde etkinleştirildi.\n\nAyrıntılı bilgi almak 
için Torbutton üzerine tıklayın.
 
 torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve 
anonim kimliğinizi zedeleyebilir.\n\nBu eklentiler Tor yazılımını 
atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu 
eklentileri etkinleştirmek istediğinize emin misiniz?\n
@@ -37,7 +37,7 @@ torbutton.slider_notification_button = Güvenlik ayarlarını 
aç
 torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı 
kaplaması, ekran boyutunuzun web siteleri tarafından öğrenilmesini ve bu 
bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser 
pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak 
tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine 
erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel 
verisini göndersin mi?
+canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak 
tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verilerine 
erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel 
verisini göndersin mi?
 canvas.notNow=Şimdi Değil
 canvas.notNowAccessKey=N
 canvas.allow=Ä°leride izin verilsin

___
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-06-21 Thread translation
commit 42cce1f20528b4738c3e2d133e367f8e8b5a9b04
Author: Translation commit bot 
Date:   Fri Jun 22 05:17:26 2018 +

Update translations for torbutton-torbuttonproperties
---
 tr/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index 4317fff50..3554ebb06 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -22,9 +22,9 @@ torbutton.popup.launch = Dosyayı indir
 torbutton.popup.cancel = Ä°ptal\n
 torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
 torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton 
sayfaların İngilizce sürümlerini göstermeyi isteyebilir. Bu özellik, web 
sayfalarının ana diliniz yerine İngilizce görüntülenmesine neden 
olabilir.\n\nDaha iyi gizlilik için web sayfalarının İngilizce 
sürümlerinin görüntülenmesini ister misiniz?
-torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik 
sağlayamadı. Tor Denetim Kapısına giriş yapılamıyor.\n\nTor Browser 
Bundle yazılımını çalıştırdığınıza emin olun.
+torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik 
sağlayamadı. Tor Denetim Kapısına giriş yapılamıyor.\n\nTor Browser 
Bundle uygulamasını çalıştırdığınızdan emin olun.
 torbutton.title.prompt_torbrowser = Önemli Torbutton Bilgisi
-torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: 
artık kapatamıyorsunuz.\n\nBu değişikliği yapmamızın nedeni Tor-Dışı 
kullanılan bir tarayıcıda Torbutton kullanmanın güvenli olmaması. Başka 
türlü çözemeyeceğimiz birçok hata vardı.\n\nFirefox tarayıcısını 
normal olarak kullanmak istiyorsanız, Torbutton yazılımını kaldırıp Tor 
Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri 
normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine 
göre çok daha üstündür.\n\nTorbutton yazılımını kaldırmak için, 
Araçlar->Eklentiler->Uzantılar bölümüne gidin ve Torbutton yazılımının 
yanındaki Kaldır düğmesine tıklayın.
+torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: 
artık kapatamıyorsunuz.\n\nBu değişikliği yapmamızın nedeni Tor 
dışında kullanılan başka bir tarayıcıda Torbutton kullanmanın güvenli 
olmaması. Başka türlü çözemeyeceğimiz birçok sorun vardı.\n\nFirefox 
tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton 
yazılımını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor 
Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton 
ile kullanan Firefox ikilisine göre çok daha üstündür.\n\nTorbutton 
yazılımını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölümüne 
gidin ve Torbutton yazılımının yanındaki Kaldır düğmesine tıklayın.
 torbutton.popup.short_torbrowser = Önemli Torbutton Bilgisi!\n\nTorbutton 
artık kapatılamayacak şekilde etkinleştirildi.\n\nAyrıntılı bilgi almak 
için Torbutton üzerine tıklayın.
 
 torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve 
anonim kimliğinizi zedeleyebilir.\n\nBu eklentiler Tor yazılımını 
atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu 
eklentileri etkinleştirmek istediğinize emin misiniz?\n
@@ -37,7 +37,7 @@ torbutton.slider_notification_button = Güvenlik ayarlarını 
aç
 torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı 
kaplaması, ekran boyutunuzun web siteleri tarafından öğrenilmesini ve bu 
bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser 
pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak 
tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine 
erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel 
verisini göndersin mi?
+canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak 
tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verilerine 
erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel 
verisini göndersin mi?
 canvas.notNow=Şimdi Değil
 canvas.notNowAccessKey=N
 canvas.allow=Ä°leride izin verilsin

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


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

2018-06-21 Thread translation
commit b2e4bbaef7ba5eb0a0034a04ea1781bde8f577cd
Author: Translation commit bot 
Date:   Fri Jun 22 05:17:06 2018 +

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

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 9dd32fb22..9ebd84522 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -12,7 +12,7 @@
 
 
 
-
+
 
 
 

___
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-06-21 Thread translation
commit 2f4d71c4f554b1fa3e37db01fcb42724ab74ad85
Author: Translation commit bot 
Date:   Fri Jun 22 05:16:52 2018 +

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

diff --git a/tr.po b/tr.po
index c93673116..0b8143fb7 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-22 04:46+\n"
+"PO-Revision-Date: 2018-06-22 05:14+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -297,7 +297,7 @@ msgstr "Tor hazır değil. Gene de Tor Browser 
başlatılsın mı?"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:45
 msgid "Start Tor Browser"
-msgstr "Tor Browser'ı Başlat"
+msgstr "Tor Browser Başlatılsın"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"

___
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-06-21 Thread translation
commit 9e3e0308ae972a201e4fb9011c22c91fe4182ba3
Author: Translation commit bot 
Date:   Fri Jun 22 05:16:56 2018 +

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

diff --git a/tr.po b/tr.po
index c93673116..0b8143fb7 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-22 04:46+\n"
+"PO-Revision-Date: 2018-06-22 05:14+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -297,7 +297,7 @@ msgstr "Tor hazır değil. Gene de Tor Browser 
başlatılsın mı?"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:45
 msgid "Start Tor Browser"
-msgstr "Tor Browser'ı Başlat"
+msgstr "Tor Browser Başlatılsın"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"

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


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

2018-06-21 Thread translation
commit b4faedaf8ecd9ac5d9a5a1ab27bfbb017bb7dd7d
Author: Translation commit bot 
Date:   Fri Jun 22 05:17:01 2018 +

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

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 9dd32fb22..9ebd84522 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -12,7 +12,7 @@
 
 
 
-
+
 
 
 

___
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-06-21 Thread translation
commit dbe31ccab38d1118019f21aaf7b62159f6bf6227
Author: Translation commit bot 
Date:   Fri Jun 22 05:16:25 2018 +

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

diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index 5fac0e8b1..a4b3f281f 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor Başlatıcı
 
 torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum 
torrc dosyasındaki ya da sisteminizdeki başka bir yazılımda bulunan bir 
hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorun 
çözülene ve Tor uygulaması yeniden başlatılana kadar Tor Browser 
çalışmayacak.
-torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor 
içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da 
sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar 
Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor 
Günlüğünün bir kopyasını destek takımına gönderin.
+torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor 
içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da 
sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar 
Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor 
Günlüğünün bir kopyasını destek ekibine gönderin.
 torlauncher.tor_exited2=Tor uygulaması yeniden başlatıldığında 
tarayıcı sekmeleriniz kapatılmayacak.
 torlauncher.tor_controlconn_failed=Tor denetim bağlantı noktasına 
bağlanılamadı.
 torlauncher.tor_failed_to_start=Tor başlatılamadı.

___
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_completed] Update translations for tor-launcher-properties_completed

2018-06-21 Thread translation
commit 8d188d17ce57eb964ff25dd80626ecb4e8392cdc
Author: Translation commit bot 
Date:   Fri Jun 22 05:16:31 2018 +

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

diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index 5fac0e8b1..a4b3f281f 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor Başlatıcı
 
 torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum 
torrc dosyasındaki ya da sisteminizdeki başka bir yazılımda bulunan bir 
hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorun 
çözülene ve Tor uygulaması yeniden başlatılana kadar Tor Browser 
çalışmayacak.
-torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor 
içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da 
sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar 
Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor 
Günlüğünün bir kopyasını destek takımına gönderin.
+torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor 
içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da 
sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar 
Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor 
Günlüğünün bir kopyasını destek ekibine gönderin.
 torlauncher.tor_exited2=Tor uygulaması yeniden başlatıldığında 
tarayıcı sekmeleriniz kapatılmayacak.
 torlauncher.tor_controlconn_failed=Tor denetim bağlantı noktasına 
bağlanılamadı.
 torlauncher.tor_failed_to_start=Tor başlatılamadı.

___
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-06-21 Thread translation
commit fde4b2fe8e079cbe7b4e0fd29a4917bdce3e7e81
Author: Translation commit bot 
Date:   Fri Jun 22 05:15:22 2018 +

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

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 34fb08481..fe5f9ecd7 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -8,7 +8,7 @@
 # Emir Sarı , 2014
 # erg26 , 2012
 # erg26 , 2012
-# Kaya Zeren , 2015
+# Kaya Zeren , 2015,2018
 # monolifed, 2014
 # mono, 2014
 # Ozancan Karataş , 2015
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-23 18:03+\n"
-"Last-Translator: Volkan Gezer \n"
+"PO-Revision-Date: 2018-06-22 04:58+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgid ""
 msgstr "Lütfen Tor'u güvenli olarak kullanmak hakkında daha ayrıntılı 
bilgi almak için https://www.torproject.org/\";>Tor web sitesine 
bakın. Artık İnternet'te anonim olarak özgürce dolaşabilirsiniz."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Tor Browser için bir güvenlik güncellemesi kullanılabilir."
+msgstr "Tor Browser için bir güvenlik güncellemesi yayınlanmış."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\";>Click "

___
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-06-21 Thread translation
commit 797a446fea0bdc98d72e1ea43571f640ed5ef1dc
Author: Translation commit bot 
Date:   Fri Jun 22 05:15:16 2018 +

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

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 34fb08481..fe5f9ecd7 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -8,7 +8,7 @@
 # Emir Sarı , 2014
 # erg26 , 2012
 # erg26 , 2012
-# Kaya Zeren , 2015
+# Kaya Zeren , 2015,2018
 # monolifed, 2014
 # mono, 2014
 # Ozancan Karataş , 2015
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-23 18:03+\n"
-"Last-Translator: Volkan Gezer \n"
+"PO-Revision-Date: 2018-06-22 04:58+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgid ""
 msgstr "Lütfen Tor'u güvenli olarak kullanmak hakkında daha ayrıntılı 
bilgi almak için https://www.torproject.org/\";>Tor web sitesine 
bakın. Artık İnternet'te anonim olarak özgürce dolaşabilirsiniz."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Tor Browser için bir güvenlik güncellemesi kullanılabilir."
+msgstr "Tor Browser için bir güvenlik güncellemesi yayınlanmış."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\";>Click "

___
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-06-21 Thread translation
commit 0e04fe78b88d7d26662dc3d216e1cadea67647e2
Author: Translation commit bot 
Date:   Fri Jun 22 05:15:11 2018 +

Update translations for bridgedb_completed
---
 tr/LC_MESSAGES/bridgedb.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 4fa290c07..97ebab40f 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@
 # eromytsatiffird , 2014
 # Fomas , 2015
 # Idil Yuksel , 2014
-# Kaya Zeren , 2015-2016
+# Kaya Zeren , 2015-2016,2018
 # Ozancan Karataş , 2015
 # ozkansib , 2014
 # Idil Yuksel , 2014
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-04-12 18:54+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-06-22 05:15+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -118,7 +118,7 @@ msgstr "%s1%s. Adım"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser'ı %s indirin"
+msgstr "%s Tor Browser Uygulamasını %s indirin"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -138,7 +138,7 @@ msgstr "%s3%s. Adım"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Şimdi %s köprüleri Tor Browser'a ekleyin %s"
+msgstr "Şimdi %s Tor Browser üzerine köprüler ekleyin %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -305,7 +305,7 @@ msgid ""
 "Try including as much info about your case as you can, including the list 
of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser 
version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nKullanmaya 
çalıştığınız köprü listesi ve Takılabilir Taşıyıcılar, Tor 
Browser sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
+msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nKullanmaya 
çalıştığınız köprü listesi ve Takılabilir Aktarımlar, Tor Browser 
sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
@@ -347,7 +347,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Köprüleri Tor Browser'a eklemek için önce\n%s Tor Browser indirme 
sayfasına %s\ngidip, Tor Browser indirme ve başlatma yönergelerini izleyin."
+msgstr "Tor Browser üzerine köprüler eklemek için\n%s Tor Browser indirme 
sayfasına %s\ngidin ve Tor Browser indirme ve başlatma yönergelerini 
izleyin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

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


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

2018-06-21 Thread translation
commit a2dde20936c7ddb1807a847ccdc053ec3d286616
Author: Translation commit bot 
Date:   Fri Jun 22 05:15:05 2018 +

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

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 4fa290c07..425fc0c3c 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@
 # eromytsatiffird , 2014
 # Fomas , 2015
 # Idil Yuksel , 2014
-# Kaya Zeren , 2015-2016
+# Kaya Zeren , 2015-2016,2018
 # Ozancan Karataş , 2015
 # ozkansib , 2014
 # Idil Yuksel , 2014
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-04-12 18:54+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-06-22 05:13+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -118,7 +118,7 @@ msgstr "%s1%s. Adım"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser'ı %s indirin"
+msgstr "%s Tor Browser Uygulamasını %s indirin"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -138,7 +138,7 @@ msgstr "%s3%s. Adım"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Şimdi %s köprüleri Tor Browser'a ekleyin %s"
+msgstr "Şimdi %s Tor Browser üzerine köprüler ekleyin %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -305,7 +305,7 @@ msgid ""
 "Try including as much info about your case as you can, including the list 
of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser 
version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nKullanmaya 
çalıştığınız köprü listesi ve Takılabilir Taşıyıcılar, Tor 
Browser sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
+msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nKullanmaya 
çalıştığınız köprü listesi ve Takılabilir Aktarımlar, Tor Browser 
sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"

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


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

2018-06-21 Thread translation
commit d1e776f8b306e1febede2f13edc70cff0013b7f1
Author: Translation commit bot 
Date:   Fri Jun 22 04:49:35 2018 +

Update translations for support-https
---
 tr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.json b/tr.json
index 625e41dd5..777a027fc 100644
--- a/tr.json
+++ b/tr.json
@@ -2,7 +2,7 @@
 "https-1": {
"id": "#https-1",
"control": "https-1",
-   "title": "When I'm using Tor, can eavesdroppers still see the 
information I share with websites, like login information and things I type 
into forms?",
+   "title": "Tor kullandığımda beni izleyen kişi ya da kuruluşlar web 
siteleri ile paylaştığım oturum açma bilgilerimi ya da formlar üzerine 
yazdığım bilgileri görebilir mi?",
"description": "Tor protects eavesdroppers from 
learning sites that you visit. However, information sent unencrypted over the 
internet using plain HTTP can still be intercepted by exit relay operators or 
anyone observing the traffic between your exit relay and your destination 
website. If the site you are visiting uses HTTPS, then the traffic leaving your 
exit relay will be encrypted, and won't be visible to eavesdroppers.If you are using HTTPS, your 
website URL will begin with \"​https://\";.This visualization shows what information is visible to 
eavesdroppers with and without Tor Br
 owser and HTTPS encryption."
 }
 }

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-06-21 Thread translation
commit adbc6076534369c568937119a1f29b6fff99ab0f
Author: Translation commit bot 
Date:   Fri Jun 22 04:48:57 2018 +

Update translations for tor-browser-manual
---
 tr/tr.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 39ceb7c81..94cdb1b92 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1228,11 +1228,11 @@ msgid ""
 "will begin with “https://”, rather than “http://”.";
 msgstr ""
 "Oturum açma parolası gibi kişisel bilgiler şifrelenmemiş olarak 
Ä°nternet "
-"üzerine gönderilirse, ağı izleyen biri tarafından kolayca elde 
edilebilir. "
-"Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu tür bir 
izlemeye "
-"karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız gerekir. Bunu 
adres "
-"çubuğundan görebilirsiniz: Bağlantınız şifreli ise, adresin başında "
-"\"http://\"; yerine \"https://\"; bulunur."
+"üzerine gönderilirse, ağı izleyen bir kişi ya da kuruluş tarafından 
kolayca "
+"elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu 
"
+"tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız 
"
+"gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız şifreli 
ise, "
+"adresin başında \"http://\"; yerine \"https://\"; bulunur."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1252,8 +1252,9 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
-"Aşağıda, ağı izleyenlerin Tor Browser ve HTTPS şifrelemesinin 
kullanıldığı "
-"ve kullanılmadığı durumlarda elde edebileceği bilgileri görebilirsiniz:"
+"Aşağıda, ağı izleyen kişi ya da kuruluşların Tor Browser ve HTTPS "
+"şifrelemesinin kullanıldığı ve kullanılmadığı durumlarda elde 
edebileceği "
+"bilgileri görebilirsiniz:"
 
 #: secure-connections.page:35
 msgid ""

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


[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-06-21 Thread translation
commit 261c38c136e360467b8f128b2bb5250321b90b8b
Author: Translation commit bot 
Date:   Fri Jun 22 04:49:02 2018 +

Update translations for tor-browser-manual_completed
---
 tr/tr.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 39ceb7c81..94cdb1b92 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1228,11 +1228,11 @@ msgid ""
 "will begin with “https://”, rather than “http://”.";
 msgstr ""
 "Oturum açma parolası gibi kişisel bilgiler şifrelenmemiş olarak 
Ä°nternet "
-"üzerine gönderilirse, ağı izleyen biri tarafından kolayca elde 
edilebilir. "
-"Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu tür bir 
izlemeye "
-"karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız gerekir. Bunu 
adres "
-"çubuğundan görebilirsiniz: Bağlantınız şifreli ise, adresin başında "
-"\"http://\"; yerine \"https://\"; bulunur."
+"üzerine gönderilirse, ağı izleyen bir kişi ya da kuruluş tarafından 
kolayca "
+"elde edilebilir. Herhangi bir web sitesinde oturum açıyorsanız, sitenin bu 
"
+"tür bir izlemeye karşı HTTPS şifreleme hizmeti sunduğundan emin olmanız 
"
+"gerekir. Bunu adres çubuğundan görebilirsiniz: Bağlantınız şifreli 
ise, "
+"adresin başında \"http://\"; yerine \"https://\"; bulunur."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1252,8 +1252,9 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
-"Aşağıda, ağı izleyenlerin Tor Browser ve HTTPS şifrelemesinin 
kullanıldığı "
-"ve kullanılmadığı durumlarda elde edebileceği bilgileri görebilirsiniz:"
+"Aşağıda, ağı izleyen kişi ya da kuruluşların Tor Browser ve HTTPS "
+"şifrelemesinin kullanıldığı ve kullanılmadığı durumlarda elde 
edebileceği "
+"bilgileri görebilirsiniz:"
 
 #: secure-connections.page:35
 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_completed] Update translations for tails-misc_completed

2018-06-21 Thread translation
commit 79ebeb9f0750c594d4e0056372596519de429925
Author: Translation commit bot 
Date:   Fri Jun 22 04:46:51 2018 +

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

diff --git a/tr.po b/tr.po
index 13da5a32c..c93673116 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-20 05:16+\n"
+"PO-Revision-Date: 2018-06-22 04:46+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkurumlara 
(e-posta ya da İnternet servis sağlayıcınıza) Tails yazılımını 
kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu nedenle farklı 
bir e-posta adresi kullanmanız önerilir.\n\n"
+msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet servis sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"

___
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-06-21 Thread translation
commit a0894e2a9bab9e5bc3f72c51ea878c857f88b1d2
Author: Translation commit bot 
Date:   Fri Jun 22 04:46:46 2018 +

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

diff --git a/tr.po b/tr.po
index 13da5a32c..c93673116 100644
--- a/tr.po
+++ b/tr.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-20 05:16+\n"
+"PO-Revision-Date: 2018-06-22 04:46+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkurumlara 
(e-posta ya da İnternet servis sağlayıcınıza) Tails yazılımını 
kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu nedenle farklı 
bir e-posta adresi kullanmanız önerilir.\n\n"
+msgstr "Karşılaştığınız sorunu çözmemize yardım 
edin!\nHata bildirme yönergelerini 
okuyun.\nGerektiğinden fazla kişisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkında\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok 
hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. 
Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da 
kuruluşlara (e-posta ya da İnternet servis sağlayıcınıza) Tails 
yazılımını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu 
nedenle farklı bir e-posta adresi kullanmanız önerilir.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"

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


[tor-commits] [tor-browser-build/maint-7.5] Bug 26451: Latest https-everywhere, fixes browser freeze

2018-06-21 Thread gk
commit 74af3e0e1432b956c11ee95d32eb68dc968fe209
Author: Arthur Edelstein 
Date:   Fri Jun 22 00:16:58 2018 +

Bug 26451: Latest https-everywhere, fixes browser freeze
---
 projects/https-everywhere/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 2385c5c..739347b 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.6.13
+version: 2018.6.21
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1



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


[tor-commits] [tor-browser-build/maint-7.5] Revert "Bug 26428: add temporary fix to avoid https-e submodule error"

2018-06-21 Thread gk
commit 1c472c7aeff5f81b1d8e8357e37168520d14a36a
Author: Arthur Edelstein 
Date:   Fri Jun 22 00:14:35 2018 +

Revert "Bug 26428: add temporary fix to avoid https-e submodule error"

This reverts commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0.

First part of Bug 26451.
---
 projects/https-everywhere/config | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index c55933e..2385c5c 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,12 +1,10 @@
 # vim: filetype=yaml sw=2
 version: 2018.6.13
-git_url: https://github.com/boklm/https-everywhere
-# Temporary fix for #26428
-git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87
+git_url: https://git.torproject.org/https-everywhere.git
+git_hash: '[% c("version") %]'
 git_submodule: 1
 gpg_keyring: https-everywhere.gpg
-# Temporarily disable gpg check for #26428
-#tag_gpg_id: 1
+tag_gpg_id: 1
 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
 var:
   # HTTPS Everywhere is expected to be the same on all platforms. To avoid



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


[tor-commits] [tor-browser-build/maint-7.5] Picking up a new HTTPS Everywhere version

2018-06-21 Thread gk
commit 431ed4db4b90f7dddf8fc9a56626dfe491e6
Author: Georg Koppen 
Date:   Fri Jun 22 04:24:31 2018 +

Picking up a new HTTPS Everywhere version
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++--
 rbm.conf| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 84f2c76..6f9af8a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -4,8 +4,8 @@ Tor Browser 7.5.6 -- June 26 2018
* Update Tor to 0.3.3.7
* Update Tor Launcher to 0.2.14.5
  * Bug 20890: Increase control port connection timeout
-   * Update HTTPS Everywhere to 2018.6.13
- * Bug 26428: Work around HTTPS Everywhere caused build bustage
+   * Update HTTPS Everywhere to 2018.6.21
+ * Bug 26451: Prevent HTTPS Everywhere from freezing the browser
* Update NoScript to 5.1.8.6
* Bug 21537: Mark .onion cookies as secure
* Bug 25938: Backport fix for cross-origin header leak (bug 1334776)
diff --git a/rbm.conf b/rbm.conf
index 31b9cc1..a741f7f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '7.5.6'
-  torbrowser_build: 'build3'
+  torbrowser_build: 'build4'
   torbrowser_incremental_from:
 - 7.5.4
 - 7.5.5

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


[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_26058'

2018-06-21 Thread gk
commit 824e6df6e8177fabcb33dac06142332add64a7dd
Merge: 46c71b6 72aacbd
Author: Georg Koppen 
Date:   Thu Jun 21 20:28:06 2018 +

Merge remote-tracking branch 'gk/bug_26058'

 src/chrome/content/torbutton.js | 16 
 src/defaults/preferences/preferences.js |  1 -
 2 files changed, 17 deletions(-)

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


[tor-commits] [torbutton/master] Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"

2018-06-21 Thread gk
commit 72aacbd7178d50abf2c95c43ce907e65b95ddb1c
Author: Georg Koppen 
Date:   Fri Jun 15 12:33:21 2018 +

Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"

This reverts commit d127873b498fb83e4f608b82a8d382df25183dd3.
---
 src/chrome/content/torbutton.js | 16 
 src/defaults/preferences/preferences.js |  1 -
 2 files changed, 17 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 7f750bc..b56a628 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -175,9 +175,6 @@ var torbutton_unique_pref_observer =
 case "privacy.firstparty.isolate":
 torbutton_update_isolation_prefs();
 break;
-case "extensions.torbutton.hide_sync_ui":
-torbutton_update_sync_ui();
-break;
 }
 }
 }
@@ -404,7 +401,6 @@ function torbutton_init() {
 
 torbutton_update_toolbutton();
 torbutton_notify_if_update_needed();
-torbutton_update_sync_ui();
 
 createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host,
 m_tb_control_port, m_tb_control_pass,
@@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI)
   return (urls.indexOf(aURI.spec) >= 0);
 }
 
-// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so,
-// hide the "Sign in to Sync" button on the hamburger menu.
-function torbutton_update_sync_ui()
-{
-  try {
-document.getElementById("PanelUI-footer-fxa").style.display =
-  getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : "";
-  } catch (e) {
-torbutton_log(5, 'Error updating the Sync UI: ' + e);
-  }
-}
-
 // Update the NoScript button to reflect any changes to noscript prefs
 function torbutton_update_noscript_button()
 {
diff --git a/src/defaults/preferences/preferences.js 
b/src/defaults/preferences/preferences.js
index f61cb89..5cfb0eb 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 
1=errorconsole, 2=debuglo
 pref("extensions.torbutton.display_circuit", true);
 pref("extensions.torbut...@torproject.org.description", 
"chrome://torbutton/locale/torbutton.properties");
 pref("extensions.torbutton.updateNeeded", false);
-pref("extensions.torbutton.hide_sync_ui", true);
 
 // Tor check and proxy prefs
 pref("extensions.torbutton.test_enabled",true);



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


[tor-commits] [user-manual/alpha] Fix typo

2018-06-21 Thread colin
commit 51f54266cec82aab9ff2a10d9779bb1f7d4b27e3
Author: Colin Childs 
Date:   Thu Jun 21 15:12:43 2018 -0500

Fix typo
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 6143f11..9b22cac 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Generate .pot file from .page files:
 Remove the itstool spam from .pot file:
 (From the base directory) sed -i '/itstool/d' tor-browser-manual.pot
 
-Ressources
+Resources
 --
 
 Mallard cheat sheet:

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


[tor-commits] [tor-launcher/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW

2018-06-21 Thread gk
commit f34580ab7e70487e5c97c67969326111ac00d074
Author: Arthur Edelstein 
Date:   Thu Jun 21 01:37:46 2018 -0700

Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
---
 src/chrome/content/network-settings.js | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/network-settings.js 
b/src/chrome/content/network-settings.js
index f86402d..0e18b29 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -304,10 +304,13 @@ function populateLocaleList(aLangPackAddons)
   let knownLanguages = {
 "en-US" : "English",
 "ar": "\u0627\u0644\u0639\u0631\u0628\u064a\u0629",
+"bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be",
+"da": "Dansk",
 "de": "Deutsch",
 "es-ES" : "Espa\u00f1ol",
 "fa": "\u0641\u0627\u0631\u0633\u06cc",
 "fr": "Fran\u00e7ais",
+"he": "\u05e2\u05d1\u05e8\u05d9\u05ea",
 "it": "Italiano",
 "ja": "\u65e5\u672c\u8a9e",
 "ko": "\ud55c\uad6d\uc5b4",
@@ -315,9 +318,11 @@ function populateLocaleList(aLangPackAddons)
 "pl": "Polski",
 "pt-PT" : "Portugu\u00eas (Europeu)",
 "ru": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439",
+"sv": "Svenska",
 "tr": "T\u00fcrk\u00e7e",
 "vi": "Ti\u1ebfng Vi\u1ec7t",
-"zh-CN" : "\u7b80\u4f53\u5b57"
+"zh-CN" : "\u7b80\u4f53\u5b57",
+"zh-TW" : "\u6b63\u9ad4\u5b57"
   };
 
   // Retrieve the current locale so we can select it within the list by 
default.

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


[tor-commits] [torbutton/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW

2018-06-21 Thread gk
commit 46c71b6a528e70386fb8165f7d1507615d1a2a47
Author: Arthur Edelstein 
Date:   Thu Jun 21 01:04:05 2018 -0700

Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
---
 trans_tools/import-translations.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/trans_tools/import-translations.sh 
b/trans_tools/import-translations.sh
index 83c2b6a..736d62f 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -2,14 +2,14 @@
 
 # This var comes from the TBB locale list.
 # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
-BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN"
+BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi 
zh-CN zh-TW"
 
 # XXX: Basque (eu) by request in #10687.
 # This is not used for official builds, but should remain 
 # so Basque XPIs can be build independently. We can do
 # this for other languages too, if anyone requests this
 # and translations are available.
-BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv da"
+BUNDLE_LOCALES="$BUNDLE_LOCALES eu"
 
 LOCALE_DIR=../src/chrome/locale
 

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


[tor-commits] [webwml/master] Adjust teor' people page entry

2018-06-21 Thread atagar
commit 8abebffcde8d23a435b69e0aaf6de77ecc36c73f
Author: Damian Johnson 
Date:   Thu Jun 21 11:03:19 2018 -0700

Adjust teor' people page entry

Dropping their name and adjusting the description per their request.
---
 about/en/corepeople.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 61b9e34c..1fa7ac9e 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -828,9 +828,9 @@
   
   
   https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43450CBA7F968F094B";>
-  Tim Wilson-Brown
+  teor
   IRC: teor
-  Onion services developer, and core member of 
Tor dev team. Researches Tor network measurement and onion service 
scalability.
+  Tor developer and chutney maintainer. Currently 
working on onion services, directory documents, and statistics.
 
   
 



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


[tor-commits] [webwml/master] Add pronouns to the people page

2018-06-21 Thread atagar
commit 2867ba62433ec8c9f4f92f9079168b59f281c3ce
Merge: 49eec96a 83b90b64
Author: Damian Johnson 
Date:   Thu Jun 21 12:46:44 2018 -0700

Add pronouns to the people page

Proposed and information collected by Tom. Quite a few other changes were
requested at the same time...

  https://lists.torproject.org/pipermail/tor-project/2018-May/001776.html

 about/en/corepeople.wml  |  46 ++-
 images/people/ilv.png| Bin 38009 -> 0 bytes
 images/people/isis.png   | Bin 36028 -> 38311 bytes
 images/people/linda.png  | Bin 40598 -> 0 bytes
 images/people/orig/isis.jpg  | Bin 46059 -> 27804 bytes
 images/people/orig/linda.jpg | Bin 910787 -> 0 bytes
 6 files changed, 32 insertions(+), 14 deletions(-)

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


[tor-commits] [webwml/master] Adjust Isis' people page entry

2018-06-21 Thread atagar
commit f02588f90306eb622b4fda65d14e2cabf4b7568b
Author: Damian Johnson 
Date:   Thu Jun 21 10:51:25 2018 -0700

Adjust Isis' people page entry

Changing the name, photo, and description as requested. I don't think
layout-wise we'll be able to include their middle name, but as before I'll 
make
layout adjustments after we have the pronouns.
---
 about/en/corepeople.wml |   4 ++--
 images/people/isis.png  | Bin 36028 -> 38311 bytes
 images/people/orig/isis.jpg | Bin 46059 -> 27804 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 270ff568..d8fa37b7 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -340,9 +340,9 @@
   
   https://twitter.com/isislovecruft";>
   https://fyb.patternsinthevoid.net/isis.html";>
-  Isis Lovecruft
+  Isis Agora Lovecruft
   IRC: isis
-  Tor developer working on censorship 
circumvention, https://gitweb.torproject.org/bridgedb.git";>BridgeDB, and 
cryptographic research, design, and implementations.
+  isis works as a C and Rust developer on the Tor 
network daemon. They tend to focus on security, censorship circumvention, and 
cryptographic research and implementation.
 
   
 
diff --git a/images/people/isis.png b/images/people/isis.png
index d4c717cf..e28b804d 100644
Binary files a/images/people/isis.png and b/images/people/isis.png differ
diff --git a/images/people/orig/isis.jpg b/images/people/orig/isis.jpg
index 23a07deb..750facac 100644
Binary files a/images/people/orig/isis.jpg and b/images/people/orig/isis.jpg 
differ



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


[tor-commits] [webwml/master] Adjust Steven's people page entry

2018-06-21 Thread atagar
commit d5fd709c37f27c22f850aca9c02c2a53a34093f8
Author: Damian Johnson 
Date:   Thu Jun 21 11:01:52 2018 -0700

Adjust Steven's people page entry

Dropping his pgp key and adjusting the description per his request.
---
 about/en/corepeople.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 0661fb7d..61b9e34c 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -786,10 +786,9 @@
   
   
   https://twitter.com/sjmurdoch";>
-  http://sec.cs.ucl.ac.uk/users/smurdoch/openpgp.html";>
   Steven Murdoch
   IRC: sjmurdoch
-  http://www.cs.ucl.ac.uk/staff/s.murdoch/";>Principal Research Fellow 
at University College London and original creator of the https://www.torproject.org/projects/torbrowser.html.en";>Tor 
Browser.
+  http://murdoch.is/"";>Principal 
Research Fellow at University College London. He is the original creator of 
the https://www.torproject.org/projects/torbrowser.html.en"";>Tor 
Browser.
 
   
 



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


[tor-commits] [webwml/master] Add pronouns to the people page

2018-06-21 Thread atagar
commit 4a591306bec225069096a4475a040d2ea962e1e3
Author: Damian Johnson 
Date:   Thu Jun 21 12:41:32 2018 -0700

Add pronouns to the people page

Proposed and information collected by Tom...

  https://lists.torproject.org/pipermail/tor-project/2018-May/001776.html
---
 about/en/corepeople.wml | 20 
 1 file changed, 20 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 1fa7ac9e..5fcb619e 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -31,6 +31,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=FDB16F45A477B314E87432EC61A208E16E7CB435";>
   Alexander Færøy
   IRC: ahf
+  Pronoun: http://pronoun.is/he";>he
   Works on core Tor development.
 
   
@@ -43,6 +44,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=FBF0E7DB1433018EE52D0DDA9FC34089CBE83CA3";>
   Alison Macrina
   IRC: flexlibris
+  Pronoun: http://pronoun.is/she";>she
   Leads the https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam";>Community
 Team and https://libraryfreedomproject.org";>Library Freedom 
Project. Works on support, outreach, and training.
 
 
@@ -146,6 +148,7 @@
   
   https://www.eff.org/files/key_cindy.txt";>
   Cindy Cohn
+  Pronoun: http://pronoun.is/she";>she
   Tor Board member and https://www.eff.org/about/staff/cindy-cohn";>Executive Director of the 
EFF. Lawyer by training, https://blog.torproject.org/blog/tor-heart-notes-board-member";>her 
focus is on making sure Tor stays available and that Tor users stay 
safe.
 
 
@@ -167,6 +170,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6";>
   Damian Johnson
   IRC: atagar
+  Pronoun: http://pronoun.is/he";>he
   Author of the https://stem.torproject.org/";>Stem python controller library and https://nyx.torproject.org/";>Nyx relay monitor.
 
 
@@ -300,6 +304,7 @@
   
   
   Ian Goldberg
+  Pronoun: http://pronoun.is/he";>he
   https://cs.uwaterloo.ca/~iang/";>Professor of CS at the https://uwaterloo.ca/";>University of Waterloo, developing https://otr.cypherpunks.ca/";>Off-the-Record Messaging among other 
things.
 
   
@@ -320,6 +325,7 @@
   
   https://gaffer.ptitcanardnoir.org/intrigeri/contact/";>
   intrigeri
+  Pronoun: http://pronoun.is/he";>he
   He is one of our main interfaces with the https://tails.boum.org/";>Tails project.
 
   
@@ -342,6 +348,7 @@
   https://fyb.patternsinthevoid.net/isis.html";>
   Isis Agora Lovecruft
   IRC: isis
+  Pronoun: http://pronoun.is/they/them";>they
   isis works as a C and Rust developer on the Tor 
network daemon. They tend to focus on security, censorship circumvention, and 
cryptographic research and implementation.
 
   
@@ -433,6 +440,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D64EFD4FDC3F46D41E";>
   Karsten Loesing
   IRC: karsten
+  Pronoun: http://pronoun.is/he";>he
   Primary researcher and developer into https://metrics.torproject.org/";>anonymous metrics which started as a 
National Science Foundation grant.
 
 
@@ -442,6 +450,7 @@
   
   Kat
   IRC: kat5
+  Pronoun: http://pronoun.is/she";>she
   Volunteer on the Community Team. Helps with 
t-shirts for relay operators and other odds and ends.
 
   
@@ -482,6 +491,7 @@
   
   Maria Xynou
   IRC: agrabeli
+  Pronoun: http://pronoun.is/she";>she
   Maria manages OONI's Partnership Program and 
writes research reports on internet censorship around the world.
 
   
@@ -493,6 +503,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A0E36124F8E990F6E";>
   Mark Smith
   IRC: mcs
+  Pronoun: http://pronoun.is/he";>he
   Developer on the Tor Browser team.
 
 
@@ -583,6 +594,7 @@
   
   Nick Hopper
   IRC: nickhopper
+  Pronoun: http://pronoun.is/he";>he
   https://www-users.cs.umn.edu/~hopper/";>Researcher interested in 
improving Tor's performance and resistance to traffic analysis. Some of my work 
is described https://www-users.cs.umn.edu/~hopper/research.html";>here.
 
   
@@ -595,6 +607,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=2133BC600AB133E1D826D173FE43009C4607B1FB";>
   Nick Mathewson
   IRC: nickm
+  Pronoun: http://pronoun.is/he";>he
   One of the three original designers of Tor - 
does a lot of the ongoing design work, and coordinates and leads ongoing 
development.
 
 
@@ -604,6 +617,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=6AB6AEE9776E782723C8ACE83E39CEABFC69F6F7";>
   Nicolas Vigier
   IRC: boklm
+  Pronoun: http://pronoun.is/he";>he
   Works on Tor Browser.
 
   
@@ -745,6 +759,7 @@
   
   Shari Steele
   IRC: ssteele
+  Pronoun: http://pro

[tor-commits] [webwml/master] Update Linus's description

2018-06-21 Thread atagar
commit 89f76aba2a35312af0da55392186ff633221046a
Author: Damian Johnson 
Date:   Thu Jun 21 10:57:32 2018 -0700

Update Linus's description
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 8b77700f..5dbd2bd9 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -473,7 +473,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA21E8BF34923291265";>
   Linus Nordberg
   IRC: ln5
-  Swedish advocate and Tor Board member. Works on 
implementing IPv6 in Tor, build automation, and runs a directory 
authority.
+  Swedish advocate and Tor Board member. He works 
on implementing IPv6 in Tor, build automation, and runs a directory 
authority.
 
 
 



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


[tor-commits] [webwml/master] Update Matt's description

2018-06-21 Thread atagar
commit 581d875dc4c8a99d5cb92fbadf409dc86e9b2094
Author: Damian Johnson 
Date:   Thu Jun 21 11:00:29 2018 -0700

Update Matt's description
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 5dbd2bd9..270ff568 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -513,7 +513,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=B7E105FC4E6D9377F89CBA4C83BCA95294FBBB0A";>
   Matt Traudt
   IRC: pastly
-  http://mattssi4lhud.onion/";>Implemented the http://www.robgjansen.com/publications/kist-sec2014.pdf";>KIST 
scheduler into Tor. Helps safely measure Tor. Says helpful things on 
IRC.
+  Matt http://mattssi4lhud.onion/";>implemented the http://www.robgjansen.com/publications/kist-sec2014.pdf";>KIST 
scheduler into Tor. He helps safely measure Tor and says helpful things on 
IRC.
 
 
 



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


[tor-commits] [webwml/master] Drop Isis' middle name

2018-06-21 Thread atagar
commit 83b90b6430b18aee0b0ef3a35e05ffb1061032c2
Author: Damian Johnson 
Date:   Thu Jun 21 12:44:23 2018 -0700

Drop Isis' middle name

With the addition of pronouns the only entry to overflow is isis. They asked
for a longer description and to include their middle name but we can't do 
both.
We can re-add their middle name if they shorten their burb.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 5fcb619e..c3f3bd19 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -346,7 +346,7 @@
   
   https://twitter.com/isislovecruft";>
   https://fyb.patternsinthevoid.net/isis.html";>
-  Isis Agora Lovecruft
+  Isis Lovecruft
   IRC: isis
   Pronoun: http://pronoun.is/they/them";>they
   isis works as a C and Rust developer on the Tor 
network daemon. They tend to focus on security, censorship circumvention, and 
cryptographic research and implementation.



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


[tor-commits] [user-manual/alpha] Use itstool instead of xml2po

2018-06-21 Thread colin
commit 39a82c3a4b6bc0bf59a7611776d3f9b82a84d6a0
Author: Colin Childs 
Date:   Thu Jun 21 14:47:54 2018 -0500

Use itstool instead of xml2po
---
 README | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 8d14304..6143f11 100644
--- a/README
+++ b/README
@@ -23,7 +23,11 @@ Build:
 
 Generating the .POT file for localization
 -
-xml2po -o tor-browser-user-manual.pot -m mallard ./C/*.page
+Generate .pot file from .page files:
+(From the C/ directory) itstool -o ../tor-browser-manual.pot *.page
+
+Remove the itstool spam from .pot file:
+(From the base directory) sed -i '/itstool/d' tor-browser-manual.pot
 
 Ressources
 --

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


[tor-commits] [webwml/master] Adjust isra's people page entry

2018-06-21 Thread atagar
commit 50bbfbf5919886f819ac5990bca4c18b4e43f558
Author: Damian Johnson 
Date:   Thu Jun 21 10:55:17 2018 -0700

Adjust isra's people page entry

Per his request dropping isra's name, photo, irc nick, and adjusting his
description.
---
 about/en/corepeople.wml  |   7 +++
 images/people/ilv.png| Bin 38009 -> 0 bytes
 images/people/linda.png  | Bin 40598 -> 0 bytes
 images/people/orig/linda.jpg | Bin 910787 -> 0 bytes
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index d8fa37b7..0661fb7d 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -349,11 +349,10 @@
   
 
   
-  
+  
   https://db.torproject.org/fetchkey.cgi?fingerprint=53927C25AAF14FBBCAFABDA3A456E2CE540BFC0E";>
-  Israel Leiva
-  IRC: ilv
-  Rewrote the https://gettor.torproject.org";>GetTor service. Volunteer on the https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam";>Community
 Team, focused on Latin America. Works in https://www.derechosdigitales.org";>Derechos Digitales.
+  isra
+  Rewrote the https://gettor.torproject.org";>GetTor service.
 
 
 
diff --git a/images/people/ilv.png b/images/people/ilv.png
deleted file mode 100644
index 78a47c7b..
Binary files a/images/people/ilv.png and /dev/null differ
diff --git a/images/people/linda.png b/images/people/linda.png
deleted file mode 100644
index 9185c5e0..
Binary files a/images/people/linda.png and /dev/null differ
diff --git a/images/people/orig/linda.jpg b/images/people/orig/linda.jpg
deleted file mode 100644
index d6a65fc6..
Binary files a/images/people/orig/linda.jpg and /dev/null differ



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


[tor-commits] [webwml/master] Update intrigeri's description

2018-06-21 Thread atagar
commit de5e0b41871917810a971136de43aa30ecc0b96a
Author: Damian Johnson 
Date:   Thu Jun 21 10:45:30 2018 -0700

Update intrigeri's description
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index fe43d596..8b77700f 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -320,7 +320,7 @@
   
   https://gaffer.ptitcanardnoir.org/intrigeri/contact/";>
   intrigeri
-  Our main interface with the https://tails.boum.org/";>Tails project.
+  He is one of our main interfaces with the https://tails.boum.org/";>Tails project.
 
   
 



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


[tor-commits] [webwml/master] Update Colin's description

2018-06-21 Thread atagar
commit c570209ec15ee7fa4448e30c8b6b19be0e9dbb20
Author: Damian Johnson 
Date:   Thu Jun 21 10:42:35 2018 -0700

Update Colin's description

Not sure if it'll fit, especially with pronouns, but adjusting the 
description
as requested by Colin for the moment. We'll see how it looks.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index bbcfccd8..fe43d596 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -156,7 +156,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=726824BE9D8D5CF009C5F039FF9D1C57779FB883";>
   Colin Childs
   IRC: Phoul
-  Relay advocate, Outreachy mentor, member of the 
community team and a director of https://www.coldhak.ca/";>Coldhak.
+  Relay advocate, Outreachy mentor, and a member 
of the community team. He is also a director of the Canadian Torservers.net 
partner https://www.coldhak.ca/";>Coldhak.
 
   
 



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


[tor-commits] [webwml/master] Change Cindy's description to third person

2018-06-21 Thread atagar
commit 9f73a34662697bba0a3b592187dd2505767e7c3c
Author: Damian Johnson 
Date:   Thu Jun 21 10:40:31 2018 -0700

Change Cindy's description to third person

Requested by Cindy.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index e704aeed..bbcfccd8 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -146,7 +146,7 @@
   
   https://www.eff.org/files/key_cindy.txt";>
   Cindy Cohn
-  Tor Board member and https://www.eff.org/about/staff/cindy-cohn";>Executive Director of the 
EFF. Lawyer by training, https://blog.torproject.org/blog/tor-heart-notes-board-member";>my 
focus is on making sure Tor stays available and that Tor users stay 
safe.
+  Tor Board member and https://www.eff.org/about/staff/cindy-cohn";>Executive Director of the 
EFF. Lawyer by training, https://blog.torproject.org/blog/tor-heart-notes-board-member";>her 
focus is on making sure Tor stays available and that Tor users stay 
safe.
 
 
 



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


[tor-commits] [user-manual/alpha] syncing translations with page file updates

2018-06-21 Thread tommyc
commit b407342d441705aef217ed4c3d91b3b63144b95f
Author: Tommy Collison 
Date:   Tue Jun 19 15:34:06 2018 -0700

syncing translations with page file updates
---
 tor-browser-manual.pot | 40 
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tor-browser-manual.pot b/tor-browser-manual.pot
index afb4d28..5c27a6d 100644
--- a/tor-browser-manual.pot
+++ b/tor-browser-manual.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-12-06 16:36-0600\n"
+"POT-Creation-Date: 2018-06-19 15:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -113,7 +113,7 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: bridges.page:63
 msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' 
md5='93365c2aa3fb4d627497e83f28a39b7e'"
+msgid "external ref='media/tor-launcher-custom-bridges.png' 
md5='34b5e99516d297fcbb467209d8479f40'"
 msgstr ""
 
 #: bridges.page:65
@@ -143,7 +143,7 @@ msgstr ""
 #: circumvention.page:26
 #: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/circumvention/configure.png' 
md5='519d888303eadfe4cb03f178aedd90f5'"
+msgid "external ref='media/circumvention/configure.png' 
md5='1107595d21fe90f2aab1263d7fb0abd3'"
 msgstr ""
 
 #: circumvention.page:28
@@ -164,7 +164,7 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/circumvention/bridges.png' 
md5='910cdd5e45860b81a1ad4739c589a195'"
+msgid "external ref='media/circumvention/bridges.png' 
md5='f5acc05bd9bacf6c69a31163d25a8778'"
 msgstr ""
 
 #: circumvention.page:51
@@ -208,7 +208,7 @@ msgid "GetTor"
 msgstr ""
 
 #: downloading.page:28
-msgid "GetTor is a service that automatically responds to messages with links 
to the latest version of Tor Browser, hosted at a variety of locations, such as 
Dropbox, Google Drive and Github.."
+msgid "GetTor is a service that automatically responds to messages with links 
to the latest version of Tor Browser, hosted at a variety of locations, such as 
Dropbox, Google Drive and GitHub.."
 msgstr ""
 
 #: downloading.page:34
@@ -294,7 +294,7 @@ msgstr ""
 #: first-time.page:21
 #: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/first-time/connect.png' 
md5='9d07068f751a3bfd274365a4ba8d90ca'"
+msgid "external ref='media/first-time/connect.png' 
md5='f6de80de01c8fa2a8f80857eb8213768'"
 msgstr ""
 
 #: first-time.page:23
@@ -323,7 +323,7 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: first-time.page:63
 msgctxt "_"
-msgid "external ref='media/first-time/proxy_question.png' 
md5='30853b3e86cfd386bbc32e5b8b45a378'"
+msgid "external ref='media/first-time/proxy_question.png' 
md5='f72753a963e3449129718e3d824a8ac8'"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
@@ -332,10 +332,10 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: first-time.page:66
 msgctxt "_"
-msgid "external ref='media/first-time/proxy.png' 
md5='13f21a351cd0aa1cf11aada690f3dc90'"
+msgid "external ref='media/first-time/proxy.png' 
md5='9a5cf5c044b1dfc5f006a9d1ff77507b'"
 msgstr ""
 
-#: index.page:6
+#: index.page:8
 msgid "Tor Browser User Manual"
 msgstr ""
 
@@ -703,11 +703,11 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: security-slider.page:23
 msgctxt "_"
-msgid "external ref='media/security-slider/slider.png' 
md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgid "external ref='media/security-slider/slider.png' 
md5='026da7c021ba5b85caf04bbf45530667'"
 msgstr ""
 
 #: security-slider.page:25
-msgid "The Security Slider is located in Torbutton’s “Privacy and Security 
Settings” menu."
+msgid "The Security Slider is located in Torbutton’s “Security Settings” 
menu."
 msgstr ""
 
 #: security-slider.page:32
@@ -720,7 +720,7 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: security-slider.page:34
 msgctxt "_"
-msgid "external ref='media/security-slider/slider_window.png' 
md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgid "external ref='media/security-slider/slider_window.png' 
md5='b544042427621246c7d1025d478235c3'"
 msgstr ""
 
 #: security-slider.page:36
@@ -736,7 +736,7 @@ msgid "At this level, HTML5 video and audio media become 
click-to-play via NoScr
 msgstr ""
 
 #: security-slider.page:53
-msgid "Medium-High"
+msgid "Medium"
 msgstr ""
 
 #: security-slider.page:54
@@ -744,18 +744,10 @@ msgid "At this level, HTML5 video and audio media become 
click-to-play via NoScr
 msgstr ""
 
 #: security-slider.page:64
-msgid "Medium-Low"
-msgstr ""
-
-#: security-slider.page:65
-msgid "At this level, HTML5 video and audio media become click-to-play via 
NoScript; some JavaScript performance 
optimizations are disabled, causin

[tor-commits] [user-manual/alpha] fixing GitHub capitalization

2018-06-21 Thread tommyc
commit b718dbecf1e27bb3c04bcbdc9b2c532da65bcff1
Author: Tommy Collison 
Date:   Tue Jun 19 14:21:29 2018 -0700

fixing GitHub capitalization
---
 C/downloading.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C/downloading.page b/C/downloading.page
index 54f78a1..5ee7007 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -28,7 +28,7 @@ below.
  
  GetTor is a service that automatically responds to messages with links
  to the latest version of Tor Browser, hosted at a  variety of locations,
- such as Dropbox, Google Drive and Github..
+ such as Dropbox, Google Drive and GitHub..
  
 
  



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


[tor-commits] [tor-browser-build/master] Fold in older changelogs

2018-06-21 Thread gk
commit 6402ea66ab8ccc58870f09222a71caceeed4e41d
Author: Georg Koppen 
Date:   Thu Jun 21 19:03:17 2018 +

Fold in older changelogs
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +
 1 file changed, 21 insertions(+)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 089cbad..4438a9d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,13 @@
+Tor Browser 8.0a8 -- June 10 2018
+ * All platforms
+   * Update Firefox to 52.8.1esr
+   * Bug 26098: Remove amazon-meek
+
+Tor Browser 7.5.5 -- June 10 2018
+ * All platforms
+   * Update Firefox to 52.8.1esr
+   * Bug 26098: Remove amazon-meek
+
 Tor Browser 8.0a7 -- May 9 2018
  * All platforms
* Update Firefox to 52.8.0esr
@@ -14,6 +24,17 @@ Tor Browser 8.0a7 -- May 9 2018
  * Linux
* Bug 26010: Change Snowflake rendezvous to use the Azure domain front
 
+Tor Browser 7.5.4 -- May 9 2018
+ * All platforms
+   * Update Firefox to 52.8.0esr
+   * Update HTTPS Everywhere to 2018.4.11
+   * Update NoScript to 5.1.8.5
+   * Bug 23439: Exempt .onion domains from mixed content warnings
+   * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable
+   * Bug 22659: Changes to `intl.accept.languages` get overwritten after 
restart
+   * Bug 25973: Backport off-by-one fix (bug 1352073)
+   * Bug 25020: Add a tbb_version.json file
+
 Tor Browser 8.0a6 -- April 19 2018
  * All platforms
* Update Tor to 0.3.3.5-rc

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


[tor-commits] [tor-browser-build/maint-7.5] Picking up a -build2 from Mozilla

2018-06-21 Thread gk
commit e2e0f83294692b6ff271ba073ad9ffa25fa5d02a
Author: Georg Koppen 
Date:   Thu Jun 21 18:48:05 2018 +

Picking up a -build2 from Mozilla
---
 projects/firefox-langpacks/config | 2 +-
 projects/firefox/config   | 2 +-
 rbm.conf  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 4e42939..04cd7dd 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index cfafe70..0ed39da 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index 079c216..31b9cc1 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '7.5.6'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
 - 7.5.4
 - 7.5.5

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


[tor-commits] [tor/master] add license statement to checkincludes, and have it return an error code

2018-06-21 Thread nickm
commit eb784aa9eaced1adb436d752ccdbeb2ff19c9e23
Author: Nick Mathewson 
Date:   Thu Jun 21 14:29:00 2018 -0400

add license statement to checkincludes, and have it return an error code
---
 scripts/maint/checkIncludes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
index b96b7f4b3..3c611675e 100755
--- a/scripts/maint/checkIncludes.py
+++ b/scripts/maint/checkIncludes.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# Copyright 2018 The Tor Project, Inc.  See LICENSE file for licensing info.
 
 import fnmatch
 import os
@@ -68,3 +69,4 @@ if trouble:
 err(
 """To change which includes are allowed in a C file, edit the {} files in its
 enclosing directory.""".format(RULES_FNAME))
+sys.exit(1)

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


[tor-commits] [tor/master] Make sure check-spaces applies in lib and dirauth.

2018-06-21 Thread nickm
commit 7f2dbbe5853eb3b9900789f5b0b66c1a3a0eb1b3
Author: Nick Mathewson 
Date:   Thu Jun 21 14:22:15 2018 -0400

Make sure check-spaces applies in lib and dirauth.
---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index e0f827d29..38e79eb7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -262,7 +262,9 @@ check-spaces:
 if USE_PERL
$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \
$(top_srcdir)/src/common/*.[ch] \
+   $(top_srcdir)/src/lib/*/*.[ch] \
$(top_srcdir)/src/or/*.[ch] \
+   $(top_srcdir)/src/or/*/*.[ch] \
$(top_srcdir)/src/test/*.[ch] \
$(top_srcdir)/src/test/*/*.[ch] \
$(top_srcdir)/src/tools/*.[ch]



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


[tor-commits] [tor/master] Fix wide lines in dirauth/dirvote.*

2018-06-21 Thread nickm
commit 8dcc015975856cde2b78f903fd85a0dc7163dfcd
Author: Nick Mathewson 
Date:   Thu Jun 21 14:23:32 2018 -0400

Fix wide lines in dirauth/dirvote.*
---
 src/or/dirauth/dirvote.c | 11 +--
 src/or/dirauth/dirvote.h |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c
index a9429a911..16439905a 100644
--- a/src/or/dirauth/dirvote.c
+++ b/src/or/dirauth/dirvote.c
@@ -4235,7 +4235,7 @@ routers_make_ed_keys_unique(smartlist_t *routers)
   if (ri2_pub < ri_pub ||
   (ri2_pub == ri_pub &&
fast_memcmp(ri->cache_info.signed_descriptor_digest,
-   
ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) {
+ ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) {
 digest256map_set(by_ed_key, pk, ri);
 ri2->omit_from_vote = 1;
   } else {
@@ -4408,10 +4408,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
 vrs->protocols = tor_strdup(ri->protocol_list);
   } else {
 vrs->protocols = tor_strdup(
-
protover_compute_for_old_tor(vrs->version));
+protover_compute_for_old_tor(vrs->version));
   }
   vrs->microdesc = dirvote_format_all_microdesc_vote_lines(ri, now,
-   
microdescriptors);
+microdescriptors);
 
   smartlist_add(routerstatuses, vrs);
 }
@@ -4504,9 +4504,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
 
   /* We should not recommend anything we don't have. */
   tor_assert_nonfatal(protover_all_supported(
- 
v3_out->recommended_relay_protocols, NULL));
+   v3_out->recommended_relay_protocols, NULL));
   tor_assert_nonfatal(protover_all_supported(
- 
v3_out->recommended_client_protocols, NULL));
+   v3_out->recommended_client_protocols, NULL));
 
   v3_out->package_lines = smartlist_new();
   {
@@ -4562,4 +4562,3 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
 
   return v3_out;
 }
-
diff --git a/src/or/dirauth/dirvote.h b/src/or/dirauth/dirvote.h
index d98d887e0..7ce8e4a69 100644
--- a/src/or/dirauth/dirvote.h
+++ b/src/or/dirauth/dirvote.h
@@ -164,7 +164,8 @@ dirvote_add_vote(const char *vote_body, const char 
**msg_out, int *status_out)
 }
 
 static inline int
-dirvote_add_signatures(const char *detached_signatures_body, const char 
*source,
+dirvote_add_signatures(const char *detached_signatures_body,
+   const char *source,
const char **msg_out)
 {
   (void) detached_signatures_body;
@@ -244,4 +245,3 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const 
routerinfo_t *ri,
 #endif /* defined(DIRVOTE_PRIVATE) */
 
 #endif /* !defined(TOR_DIRVOTE_H) */
-

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


[tor-commits] [tor/master] New script to check includes for modularity violations

2018-06-21 Thread nickm
commit 999f7984e189250216fcd0bbbe1c4c8d1b0c380b
Author: Nick Mathewson 
Date:   Thu Jun 21 14:02:11 2018 -0400

New script to check includes for modularity violations

Includes configuration files to enforce these rules on lib and
common.  Of course, "common" *is* a modularity violation right now,
so these rules aren't as strict as I would like them to be.
---
 scripts/maint/checkIncludes.py   | 70 
 src/common/.may_include  | 14 
 src/lib/cc/.may_include  |  1 +
 src/lib/compress/.may_include|  6 
 src/lib/crypt_ops/.may_include   | 14 
 src/lib/ctime/.may_include   |  6 
 src/lib/err/.may_include |  3 ++
 src/lib/testsupport/.may_include |  0
 src/lib/tls/.may_include | 11 +++
 src/lib/tls/buffers_tls.c|  2 --
 src/lib/trace/.may_include   |  5 +++
 11 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
new file mode 100755
index 0..b96b7f4b3
--- /dev/null
+++ b/scripts/maint/checkIncludes.py
@@ -0,0 +1,70 @@
+#!/usr/bin/python3
+
+import fnmatch
+import os
+import re
+import sys
+
+trouble = False
+
+def err(msg):
+global trouble
+trouble = True
+print(msg, file=sys.stderr)
+
+def fname_is_c(fname):
+return fname.endswith(".h") or fname.endswith(".c")
+
+INCLUDE_PATTERN = re.compile(r'\s*#\s*include\s+"([^"]*)"')
+RULES_FNAME = ".may_include"
+
+class Rules(object):
+def __init__(self):
+self.patterns = []
+
+def addPattern(self, pattern):
+self.patterns.append(pattern)
+
+def includeOk(self, path):
+for pattern in self.patterns:
+if fnmatch.fnmatchcase(path, pattern):
+return True
+return False
+
+def applyToLines(self, lines, context=""):
+lineno = 0
+for line in lines:
+lineno += 1
+m = INCLUDE_PATTERN.match(line)
+if m:
+include = m.group(1)
+if not self.includeOk(include):
+err("Forbidden include of {} on line {}{}".format(
+include, lineno, context))
+
+def applyToFile(self, fname):
+with open(fname, 'r') as f:
+#print(fname)
+self.applyToLines(iter(f), " of {}".format(fname))
+
+def load_include_rules(fname):
+result = Rules()
+with open(fname, 'r') as f:
+for line in f:
+line = line.strip()
+if line.startswith("#") or not line:
+continue
+result.addPattern(line)
+return result
+
+for dirpath, dirnames, fnames in os.walk("src"):
+if ".may_include" in fnames:
+rules = load_include_rules(os.path.join(dirpath, RULES_FNAME))
+for fname in fnames:
+if fname_is_c(fname):
+rules.applyToFile(os.path.join(dirpath,fname))
+
+if trouble:
+err(
+"""To change which includes are allowed in a C file, edit the {} files in its
+enclosing directory.""".format(RULES_FNAME))
diff --git a/src/common/.may_include b/src/common/.may_include
new file mode 100644
index 0..d2a3d2fff
--- /dev/null
+++ b/src/common/.may_include
@@ -0,0 +1,14 @@
+orconfig.h
+common/*.h
+lib/*/*.h
+
+#  These all belong somewhere else
+ht.h
+linux_syscalls.inc
+micro-revision.i
+siphash.h
+src/ext/timeouts/timeout.c
+strlcat.c
+strlcpy.c
+tor_queue.h
+tor_readpassphrase.h
diff --git a/src/lib/cc/.may_include b/src/lib/cc/.may_include
new file mode 100644
index 0..2b06e8519
--- /dev/null
+++ b/src/lib/cc/.may_include
@@ -0,0 +1 @@
+orconfig.h
diff --git a/src/lib/compress/.may_include b/src/lib/compress/.may_include
new file mode 100644
index 0..70528a7df
--- /dev/null
+++ b/src/lib/compress/.may_include
@@ -0,0 +1,6 @@
+orconfig.h
+lib/cc/*.h
+lib/compress/*.h
+
+# XXX I'd like to remove this.
+common/*.h
diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include
new file mode 100644
index 0..6eefec158
--- /dev/null
+++ b/src/lib/crypt_ops/.may_include
@@ -0,0 +1,14 @@
+orconfig.h
+lib/cc/*.h
+lib/crypt_ops/*.h
+lib/ctime/*.h
+lib/err/*.h
+lib/testsupport/testsupport.h
+
+trunnel/pwbox.h
+
+keccak-tiny/*.h
+ed25519/*.h
+
+# XXX I'd like to remove this.
+common/*.h
diff --git a/src/lib/ctime/.may_include b/src/lib/ctime/.may_include
new file mode 100644
index 0..72d854c37
--- /dev/null
+++ b/src/lib/ctime/.may_include
@@ -0,0 +1,6 @@
+orconfig.h
+lib/cc/*.h
+lib/ctime/*.h
+
+#  I'd like to remove this
+common/util.h
diff --git a/src/lib/err/.may_include b/src/lib/err/.may_include
new file mode 100644
index 0..48cc0ef08
--- /dev/null
+++ b/src/lib/err/.may_include
@@ -0,0 +1,3 @@
+orconfig.h
+lib/cc/*.h
+lib/err/*.h
diff --git a/src/lib/testsupport/.may_include b/src/lib/testsupport/.may_include
new file mode 100644
index 0..e69de29bb
diff --git a/src/lib/tls/.may_include b

[tor-commits] [tor/master] Run checkIncludes.py from "make check-includes"

2018-06-21 Thread nickm
commit 946428d27382fdd0635d429229e7d30442cd977e
Author: Nick Mathewson 
Date:   Thu Jun 21 14:20:43 2018 -0400

Run checkIncludes.py from "make check-includes"
---
 Makefile.am | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 4ccee670e..e0f827d29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,6 +100,7 @@ EXTRA_DIST+= \
Makefile.nmake  \
README  \
ReleaseNotes\
+   scripts/maint/checkIncludes.py  \
scripts/maint/checkSpace.pl
 
 ## This tells etags how to find mockable function definitions.
@@ -267,6 +268,11 @@ if USE_PERL
$(top_srcdir)/src/tools/*.[ch]
 endif
 
+check-includes:
+if USEPYTHON
+   $(top_srcdir)/scripts/maint/checkIncludes.py
+endif
+
 check-docs: all
$(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl
 

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


[tor-commits] [tor/master] Rectify include paths (automated).

2018-06-21 Thread nickm
commit 3305ae50442aaed13a9e15c392439c348e6182be
Author: Nick Mathewson 
Date:   Thu Jun 21 13:12:23 2018 -0400

Rectify include paths (automated).

You have no idea how glad I am that this is automated.
---
 src/common/buffers.h  | 2 +-
 src/common/compat.h   | 2 +-
 src/common/compat_libevent.h  | 2 +-
 src/common/compat_threads.h   | 2 +-
 src/common/timers.h   | 2 +-
 src/common/token_bucket.h | 2 +-
 src/common/torlog.h   | 2 +-
 src/common/util.h | 2 +-
 src/common/util_bug.h | 2 +-
 src/common/util_format.h  | 2 +-
 src/lib/crypt_ops/crypto_curve25519.h | 2 +-
 src/lib/crypt_ops/crypto_ed25519.h| 2 +-
 src/lib/crypt_ops/crypto_format.h | 2 +-
 src/lib/crypt_ops/crypto_rand.c   | 2 +-
 src/lib/crypt_ops/crypto_rsa.h| 2 +-
 src/lib/tls/tortls.h  | 2 +-
 src/or/addressmap.h   | 2 +-
 src/or/circuitlist.h  | 2 +-
 src/or/circuitmux.h   | 2 +-
 src/or/config.h   | 2 +-
 src/or/connection_edge.h  | 2 +-
 src/or/dirauth/dircollate.h   | 2 +-
 src/or/dirserv.h  | 2 +-
 src/or/geoip.h| 2 +-
 src/or/hibernate.h| 2 +-
 src/or/keypin.h   | 2 +-
 src/or/networkstatus.h| 2 +-
 src/or/router.h   | 2 +-
 src/or/routerlist.h   | 2 +-
 src/or/scheduler.h| 2 +-
 src/or/status.h   | 2 +-
 src/test/test_channelpadding.c| 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5956e3484..80103af77 100644
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -14,7 +14,7 @@
 
 #include "common/compat.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 typedef struct buf_t buf_t;
 
diff --git a/src/common/compat.h b/src/common/compat.h
index 654f10390..dff29a42b 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -15,7 +15,7 @@
 #endif
 #endif
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include 
 #endif
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 76a074d93..4b2672b7b 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -5,7 +5,7 @@
 #define TOR_COMPAT_LIBEVENT_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h
index ed0ece5ab..19e0a4f11 100644
--- a/src/common/compat_threads.h
+++ b/src/common/compat_threads.h
@@ -8,7 +8,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include 
diff --git a/src/common/timers.h b/src/common/timers.h
index 6b6179ca7..2348c7b7c 100644
--- a/src/common/timers.h
+++ b/src/common/timers.h
@@ -5,7 +5,7 @@
 #define TOR_TIMERS_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 struct monotime_t;
 typedef struct timeout tor_timer_t;
diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index fd6834f26..787317fa1 100644
--- a/src/common/token_bucket.h
+++ b/src/common/token_bucket.h
@@ -10,7 +10,7 @@
 #define TOR_TOKEN_BUCKET_H
 
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */
 #define TOKEN_BUCKET_MAX_BURST INT32_MAX
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 56f922d40..66141ab0a 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -13,7 +13,7 @@
 #ifndef TOR_TORLOG_H
 
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #ifdef HAVE_SYSLOG_H
 #include 
diff --git a/src/common/util.h b/src/common/util.h
index cb8cefb12..d1528886c 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -15,7 +15,7 @@
 #include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include 
 #include 
 #ifdef _WIN32
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 1d499a197..9659f59b7 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -38,7 +38,7 @@
 
 #include "orconfig.h"
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /* Replace assert() with a variant that sends failures to the log before
  * callin

[tor-commits] [tor/master] Move responsibility for libdonna out of src/common

2018-06-21 Thread nickm
commit e9943d5459c30a7dba8fa99c7f1537e3ab208749
Author: Nick Mathewson 
Date:   Thu Jun 21 13:04:09 2018 -0400

Move responsibility for libdonna out of src/common
---
 .gitignore  |  3 +--
 src/common/include.am   | 25 -
 src/include.am  |  1 +
 src/lib/include.libdonna.am | 24 
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index d797f4f53..07fa3afac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,8 +144,6 @@ uptime-*.json
 /src/common/libor-event.a
 /src/common/libor-event-testing.a
 /src/common/libor-event.lib
-/src/common/libcurve25519_donna.a
-/src/common/libcurve25519_donna.lib
 
 # /src/config/
 /src/config/Makefile
@@ -164,6 +162,7 @@ uptime-*.json
 /src/ext/keccak-tiny/libkeccak-tiny.lib
 
 # /src/lib
+/src/lib/libcurve25519_donna.a
 /src/lib/libtor-compress.a
 /src/lib/libtor-compress-testing.a
 /src/lib/libtor-crypt-ops.a
diff --git a/src/common/include.am b/src/common/include.am
index fb5472f3b..3b49220ce 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -17,31 +17,6 @@ else
 libor_extra_source=
 endif
 
-src_common_libcurve25519_donna_a_CFLAGS=
-
-if BUILD_CURVE25519_DONNA
-src_common_libcurve25519_donna_a_SOURCES=\
-   src/ext/curve25519_donna/curve25519-donna.c
-# See bug 13538 -- this code is known to have signed overflow issues.
-src_common_libcurve25519_donna_a_CFLAGS+=\
-   @F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@
-noinst_LIBRARIES+=src/common/libcurve25519_donna.a
-LIBDONNA=src/common/libcurve25519_donna.a
-else
-if BUILD_CURVE25519_DONNA_C64
-src_common_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@
-src_common_libcurve25519_donna_a_SOURCES=\
-   src/ext/curve25519_donna/curve25519-donna-c64.c
-noinst_LIBRARIES+=src/common/libcurve25519_donna.a
-LIBDONNA=src/common/libcurve25519_donna.a
-else
-LIBDONNA=
-endif
-endif
-
-LIBDONNA += $(LIBED25519_REF10)
-LIBDONNA += $(LIBED25519_DONNA)
-
 if THREADS_PTHREADS
 threads_impl_source=src/common/compat_pthreads.c
 endif
diff --git a/src/include.am b/src/include.am
index e82943f73..685fe3433 100644
--- a/src/include.am
+++ b/src/include.am
@@ -4,6 +4,7 @@ include src/lib/cc/include.am
 include src/lib/ctime/include.am
 include src/lib/compress/include.am
 include src/lib/crypt_ops/include.am
+include src/lib/include.libdonna.am
 include src/lib/tls/include.am
 include src/lib/trace/include.am
 include src/common/include.am
diff --git a/src/lib/include.libdonna.am b/src/lib/include.libdonna.am
new file mode 100644
index 0..5b92dc58a
--- /dev/null
+++ b/src/lib/include.libdonna.am
@@ -0,0 +1,24 @@
+src_lib_libcurve25519_donna_a_CFLAGS=
+
+if BUILD_CURVE25519_DONNA
+src_lib_libcurve25519_donna_a_SOURCES=\
+   src/ext/curve25519_donna/curve25519-donna.c
+# See bug 13538 -- this code is known to have signed overflow issues.
+src_lib_libcurve25519_donna_a_CFLAGS+=\
+   @F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@
+noinst_LIBRARIES+=src/lib/libcurve25519_donna.a
+LIBDONNA=src/lib/libcurve25519_donna.a
+else
+if BUILD_CURVE25519_DONNA_C64
+src_lib_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@
+src_lib_libcurve25519_donna_a_SOURCES=\
+   src/ext/curve25519_donna/curve25519-donna-c64.c
+noinst_LIBRARIES+=src/lib/libcurve25519_donna.a
+LIBDONNA=src/lib/libcurve25519_donna.a
+else
+LIBDONNA=
+endif
+endif
+
+LIBDONNA += $(LIBED25519_REF10)
+LIBDONNA += $(LIBED25519_DONNA)



___
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 'extract_easy_common_libs'

2018-06-21 Thread nickm
commit 8918bd90e9ddc135c0519177a07cd7a8c18859ed
Merge: 471418bef 3305ae504
Author: Nick Mathewson 
Date:   Thu Jun 21 13:57:13 2018 -0400

Merge branch 'extract_easy_common_libs'

 .gitignore |  13 +-
 Makefile.am|  14 +-
 src/common/address.h   |   2 +-
 src/common/address_set.c   |   2 +-
 src/common/address_set.h   |   2 +-
 src/common/buffers.c   |   4 +-
 src/common/buffers.h   |   4 +-
 src/common/compat.h|  54 +--
 src/common/compat_libevent.c   |   2 +-
 src/common/compat_libevent.h   |   2 +-
 src/common/compat_threads.h|   4 +-
 src/common/container.c |   2 +-
 src/common/include.am  |  83 --
 src/common/pubsub.c| 129 ---
 src/common/pubsub.h| 179 -
 src/common/sandbox.c   |   2 +-
 src/common/sandbox.h   |   2 +-
 src/common/timers.h|   2 +-
 src/common/token_bucket.h  |   4 +-
 src/common/torlog.h|   2 +-
 src/common/util.c  |   4 +-
 src/common/util.h  |   4 +-
 src/common/util_bug.h  |   2 +-
 src/common/util_format.c   |   2 +-
 src/common/util_format.h   |   4 +-
 src/common/workqueue.c |   2 +-
 src/ext/OpenBSD_malloc_Linux.c |   2 +-
 src/ext/csiphash.c |   2 +-
 src/ext/curve25519_donna/curve25519-donna-c64.c|   2 +-
 src/ext/curve25519_donna/curve25519-donna.c|   2 +-
 src/ext/ed25519/donna/ed25519-hash-custom.h|   2 +-
 src/ext/ed25519/donna/ed25519-randombytes-custom.h |   2 +-
 src/ext/ed25519/donna/ed25519_donna_tor.h  |   2 +-
 src/ext/ed25519/donna/ed25519_tor.c|   2 +-
 src/ext/ed25519/ref10/blinding.c   |   2 +-
 src/ext/ed25519/ref10/crypto_hash_sha512.h |   2 +-
 src/ext/ed25519/ref10/crypto_int32.h   |   2 +-
 src/ext/ed25519/ref10/crypto_int64.h   |   2 +-
 src/ext/ed25519/ref10/crypto_uint32.h  |   2 +-
 src/ext/ed25519/ref10/crypto_uint64.h  |   2 +-
 src/ext/ed25519/ref10/ed25519_ref10.h  |   2 +-
 src/ext/ed25519/ref10/keypair.c|   4 +-
 src/ext/ed25519/ref10/randombytes.h|   2 +-
 src/ext/keccak-tiny/keccak-tiny-unrolled.c |   2 +-
 src/ext/keccak-tiny/keccak-tiny.h  |   2 +-
 src/ext/mulodi/mulodi4.c   |   2 +-
 src/include.am |   8 +-
 src/{common => lib/cc}/compat_compiler.h   |  48 ++
 src/lib/cc/include.am  |   4 +
 src/{common => lib/cc}/torint.h|   0
 src/{common => lib/compress}/compress.c|  12 +-
 src/{common => lib/compress}/compress.h|   0
 src/{common => lib/compress}/compress_lzma.c   |   4 +-
 src/{common => lib/compress}/compress_lzma.h   |   0
 src/{common => lib/compress}/compress_none.c   |   4 +-
 src/{common => lib/compress}/compress_none.h   |   0
 src/{common => lib/compress}/compress_zlib.c   |   4 +-
 src/{common => lib/compress}/compress_zlib.h   |   0
 src/{common => lib/compress}/compress_zstd.c   |   4 +-
 src/{common => lib/compress}/compress_zstd.h   |   0
 src/lib/compress/include.am|  25 +++
 src/{common => lib/crypt_ops}/aes.c|   6 +-
 src/{common => lib/crypt_ops}/aes.h|   0
 src/{common => lib/crypt_ops}/compat_openssl.h |   2 +-
 src/{common => lib/crypt_ops}/crypto.c |  24 +--
 src/{common => lib/crypt_ops}/crypto.h |   4 +-
 src/{common => lib/crypt_ops}/crypto_curve25519.c  |  10 +-
 src/{common => lib/crypt_ops}/crypto_curve25519.h  |   8 +-
 src/{common => lib/crypt_ops}/crypto_dh.c  |  10 +-
 src/{common => lib/crypt_ops}/crypto_dh.h  |   0
 src/{common => lib/crypt_ops}/crypto_digest.c  |   6 +-
 src/{common => lib/crypt_ops}/crypto_digest.h  |   2 +-
 src/{common => lib/crypt_ops}/crypto_ed25519.c |  12 +-
 src/{common => lib/crypt_ops}/crypto_ed25519.h |   6 +-
 src/{common => lib/crypt_ops}/crypto_format.c  |  10 +-
 src/{common => lib/crypt_ops}/crypto_format.h  |   6 +-
 src/{common => lib/crypt_ops}/crypto_hkdf.c|   8 +-
 src/{common => lib/crypt_ops}/crypto_hkdf.h|   0
 src/{common => lib/crypt_ops}/cry

[tor-commits] [tor/master] Move compiler-compatibility headers into their own module

2018-06-21 Thread nickm
commit cd8f91955366719d5060264a613c3296b888ec6d
Author: Nick Mathewson 
Date:   Thu Jun 21 12:20:26 2018 -0400

Move compiler-compatibility headers into their own module

This one has no generated code.
---
 src/common/include.am| 2 --
 src/{common => lib/cc}/compat_compiler.h | 0
 src/lib/cc/include.am| 4 
 src/{common => lib/cc}/torint.h  | 0
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/include.am b/src/common/include.am
index 0119b5cf1..2869c2ac9 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -136,7 +136,6 @@ COMMONHEADERS = \
   src/common/aes.h \
   src/common/ciphers.inc   \
   src/common/compat.h  \
-  src/common/compat_compiler.h \
   src/common/compat_libevent.h \
   src/common/compat_openssl.h  \
   src/common/compat_threads.h  \
@@ -165,7 +164,6 @@ COMMONHEADERS = \
   src/common/testsupport.h \
   src/common/timers.h  \
   src/common/token_bucket.h\
-  src/common/torint.h  \
   src/common/torlog.h  \
   src/common/tortls.h  \
   src/common/util.h\
diff --git a/src/common/compat_compiler.h b/src/lib/cc/compat_compiler.h
similarity index 100%
rename from src/common/compat_compiler.h
rename to src/lib/cc/compat_compiler.h
diff --git a/src/lib/cc/include.am b/src/lib/cc/include.am
new file mode 100644
index 0..2ae90f97d
--- /dev/null
+++ b/src/lib/cc/include.am
@@ -0,0 +1,4 @@
+
+noinst_HEADERS += \
+   src/lib/cc/compat_compiler.h \
+   src/lib/cc/torint.h
diff --git a/src/common/torint.h b/src/lib/cc/torint.h
similarity index 100%
rename from src/common/torint.h
rename to src/lib/cc/torint.h



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


[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit 209a2851663c62474b7b719d03fcca378201c0f9
Author: Nick Mathewson 
Date:   Thu Jun 21 12:03:34 2018 -0400

Rectify include paths (automated)
---
 src/lib/trace/events.h | 2 +-
 src/lib/trace/trace.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/trace/events.h b/src/lib/trace/events.h
index 761a0f4eb..6d4269aae 100644
--- a/src/lib/trace/events.h
+++ b/src/lib/trace/events.h
@@ -31,7 +31,7 @@
 /* Enable event tracing for the debug framework where all trace events are
  * mapped to a log_debug(). */
 #ifdef USE_EVENT_TRACING_DEBUG
-#include "trace/debug.h"
+#include "lib/trace/debug.h"
 #endif
 
 #else /* TOR_EVENT_TRACING_ENABLED */
diff --git a/src/lib/trace/trace.c b/src/lib/trace/trace.c
index b39a2bbc5..c00cc 100644
--- a/src/lib/trace/trace.c
+++ b/src/lib/trace/trace.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2017-2018, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
-#include "trace/trace.h"
+#include "lib/trace/trace.h"
 
 /** Initialize the tracing library. */
 void



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


[tor-commits] [tor/master] Move testsupport.h to its own directory

2018-06-21 Thread nickm
commit 5b8f4769dc93bf3c934dd6b2fdfec2977b8bee55
Author: Nick Mathewson 
Date:   Thu Jun 21 13:12:06 2018 -0400

Move testsupport.h to its own directory
---
 src/common/include.am | 1 -
 src/include.am| 1 +
 src/lib/testsupport/include.am| 3 +++
 src/{common => lib/testsupport}/testsupport.h | 0
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/include.am b/src/common/include.am
index 3b49220ce..29bbdd769 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -94,7 +94,6 @@ COMMONHEADERS = \
   src/common/procmon.h \
   src/common/sandbox.h \
   src/common/storagedir.h  \
-  src/common/testsupport.h \
   src/common/timers.h  \
   src/common/token_bucket.h\
   src/common/torlog.h  \
diff --git a/src/include.am b/src/include.am
index 685fe3433..c70a68188 100644
--- a/src/include.am
+++ b/src/include.am
@@ -5,6 +5,7 @@ include src/lib/ctime/include.am
 include src/lib/compress/include.am
 include src/lib/crypt_ops/include.am
 include src/lib/include.libdonna.am
+include src/lib/testsupport/include.am
 include src/lib/tls/include.am
 include src/lib/trace/include.am
 include src/common/include.am
diff --git a/src/lib/testsupport/include.am b/src/lib/testsupport/include.am
new file mode 100644
index 0..b2aa62098
--- /dev/null
+++ b/src/lib/testsupport/include.am
@@ -0,0 +1,3 @@
+
+noinst_HEADERS += \
+   src/lib/testsupport/testsupport.h
diff --git a/src/common/testsupport.h b/src/lib/testsupport/testsupport.h
similarity index 100%
rename from src/common/testsupport.h
rename to src/lib/testsupport/testsupport.h



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


[tor-commits] [tor/master] Additional non-automated change to trunnel-local.h

2018-06-21 Thread nickm
commit 71571e34283d071b15fce62bce49f0a268f53cd6
Author: Nick Mathewson 
Date:   Thu Jun 21 12:47:48 2018 -0400

Additional non-automated change to trunnel-local.h
---
 src/trunnel/trunnel-local.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index f25659bf6..df852acb1 100644
--- a/src/trunnel/trunnel-local.h
+++ b/src/trunnel/trunnel-local.h
@@ -4,7 +4,7 @@
 
 #include "common/util.h"
 #include "common/compat.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 #define trunnel_malloc tor_malloc
 #define trunnel_calloc tor_calloc



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


[tor-commits] [tor/master] Split crypto and tls libraries into directories

2018-06-21 Thread nickm
commit 25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0
Author: Nick Mathewson 
Date:   Thu Jun 21 12:46:11 2018 -0400

Split crypto and tls libraries into directories

I am calling the crypto library "crypt_ops", since I want
higher-level crypto things to be separated from lower-level ones.
This library will hold only the low-level ones, once we have it
refactored.
---
 .gitignore |  7 ++--
 Makefile.am|  6 ++-
 src/common/include.am  | 43 -
 src/include.am |  2 +
 src/{common => lib/crypt_ops}/aes.c|  0
 src/{common => lib/crypt_ops}/aes.h|  0
 src/{common => lib/crypt_ops}/compat_openssl.h |  0
 src/{common => lib/crypt_ops}/crypto.c |  0
 src/{common => lib/crypt_ops}/crypto.h |  0
 src/{common => lib/crypt_ops}/crypto_curve25519.c  |  0
 src/{common => lib/crypt_ops}/crypto_curve25519.h  |  0
 src/{common => lib/crypt_ops}/crypto_dh.c  |  0
 src/{common => lib/crypt_ops}/crypto_dh.h  |  0
 src/{common => lib/crypt_ops}/crypto_digest.c  |  0
 src/{common => lib/crypt_ops}/crypto_digest.h  |  0
 src/{common => lib/crypt_ops}/crypto_ed25519.c |  0
 src/{common => lib/crypt_ops}/crypto_ed25519.h |  0
 src/{common => lib/crypt_ops}/crypto_format.c  |  0
 src/{common => lib/crypt_ops}/crypto_format.h  |  0
 src/{common => lib/crypt_ops}/crypto_hkdf.c|  0
 src/{common => lib/crypt_ops}/crypto_hkdf.h|  0
 src/{common => lib/crypt_ops}/crypto_openssl_mgt.c |  0
 src/{common => lib/crypt_ops}/crypto_openssl_mgt.h |  0
 src/{common => lib/crypt_ops}/crypto_pwbox.c   |  0
 src/{common => lib/crypt_ops}/crypto_pwbox.h   |  0
 src/{common => lib/crypt_ops}/crypto_rand.c|  0
 src/{common => lib/crypt_ops}/crypto_rand.h|  0
 src/{common => lib/crypt_ops}/crypto_rsa.c |  0
 src/{common => lib/crypt_ops}/crypto_rsa.h |  0
 src/{common => lib/crypt_ops}/crypto_s2k.c |  0
 src/{common => lib/crypt_ops}/crypto_s2k.h |  0
 src/{common => lib/crypt_ops}/crypto_util.c|  0
 src/{common => lib/crypt_ops}/crypto_util.h|  0
 src/lib/crypt_ops/include.am   | 44 ++
 src/{common => lib/tls}/buffers_tls.c  |  0
 src/{common => lib/tls}/buffers_tls.h  |  0
 src/{common => lib/tls}/ciphers.inc|  0
 src/lib/tls/include.am | 20 ++
 src/{common => lib/tls}/tortls.c   |  0
 src/{common => lib/tls}/tortls.h   |  0
 src/rust/build.rs  |  2 +-
 41 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2716bac83..d797f4f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,9 +141,6 @@ uptime-*.json
 /src/common/libor-ctime.a
 /src/common/libor-ctime-testing.a
 /src/common/libor-ctime.lib
-/src/common/libor-crypto.a
-/src/common/libor-crypto-testing.a
-/src/common/libor-crypto.lib
 /src/common/libor-event.a
 /src/common/libor-event-testing.a
 /src/common/libor-event.lib
@@ -169,10 +166,14 @@ uptime-*.json
 # /src/lib
 /src/lib/libtor-compress.a
 /src/lib/libtor-compress-testing.a
+/src/lib/libtor-crypt-ops.a
+/src/lib/libtor-crypt-ops-testing.a
 /src/lib/libtor-ctime.a
 /src/lib/libtor-ctime-testing.a
 /src/lib/libtor-err.a
 /src/lib/libtor-err-testing.a
+/src/lib/libtor-tls.a
+/src/lib/libtor-tls-testing.a
 /src/lib/libtor-trace.a
 
 # /src/or/
diff --git a/Makefile.am b/Makefile.am
index 62c0e2a4a..4ccee670e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,14 +52,16 @@ TOR_UTIL_TESTING_LIBS = \
 
 # Internal crypto libraries used in Tor
 TOR_CRYPTO_LIBS = \
-   src/common/libor-crypto.a \
+   src/lib/libtor-tls.a \
+   src/lib/libtor-crypt-ops.a \
$(LIBKECCAK_TINY) \
$(LIBDONNA)
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 TOR_CRYPTO_TESTING_LIBS = \
-   src/common/libor-crypto-testing.a \
+   src/lib/libtor-tls-testing.a \
+   src/lib/libtor-crypt-ops-testing.a \
$(LIBKECCAK_TINY) \
$(LIBDONNA)
 
diff --git a/src/common/include.am b/src/common/include.am
index 2869c2ac9..fb5472f3b 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -1,13 +1,11 @@
 
 noinst_LIBRARIES += \
src/common/libor.a \
-   src/common/libor-crypto.a \
src/common/libor-event.a
 
 if UNITTESTS_ENABLED
 noinst_LIBRARIES += \
src/common/libor-testing.a \
-   src/common/libor-crypto-testing.a \
src/common/libor-event-testing.a
 endif
 
@@ -83,24 +81,6 @@ LIBOR_A_SRC = \
 src/common/src_common_libor_testing_a-log.$(OBJEXT) \
   src/common/log.$(OBJEXT): micro-revision.i
 
-LIBOR_CRYPTO_A_SRC = \
-  src/common/aes.c \
-  src/common/b

[tor-commits] [tor/master] Move more compiler-compatibility stuff into compat_compiler.h

2018-06-21 Thread nickm
commit 49d7c9ce53daa13daae59eedceb07d28e06e4395
Author: Nick Mathewson 
Date:   Thu Jun 21 12:29:34 2018 -0400

Move more compiler-compatibility stuff into compat_compiler.h
---
 src/common/compat.h  | 48 
 src/include.am   |  1 +
 src/lib/cc/compat_compiler.h | 48 
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index 0cc257fc9..654f10390 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -78,54 +78,6 @@ size_t strlcat(char *dst, const char *src, size_t siz) 
ATTR_NONNULL((1,2));
 size_t strlcpy(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2));
 #endif
 
-#ifdef _MSC_VER
-/** Casts the uint64_t value in a to the right type for an argument
- * to printf. */
-#define U64_PRINTF_ARG(a) (a)
-/** Casts the uint64_t* value in a to the right type for an argument
- * to scanf. */
-#define U64_SCANF_ARG(a) (a)
-/** Expands to a literal uint64_t-typed constant for the value n. */
-#define U64_LITERAL(n) (n ## ui64)
-#define I64_PRINTF_ARG(a) (a)
-#define I64_SCANF_ARG(a) (a)
-#define I64_LITERAL(n) (n ## i64)
-#else /* !(defined(_MSC_VER)) */
-#define U64_PRINTF_ARG(a) ((long long unsigned int)(a))
-#define U64_SCANF_ARG(a) ((long long unsigned int*)(a))
-#define U64_LITERAL(n) (n ## llu)
-#define I64_PRINTF_ARG(a) ((long long signed int)(a))
-#define I64_SCANF_ARG(a) ((long long signed int*)(a))
-#define I64_LITERAL(n) (n ## ll)
-#endif /* defined(_MSC_VER) */
-
-#if defined(__MINGW32__) || defined(__MINGW64__)
-#define MINGW_ANY
-#endif
-
-#if defined(_MSC_VER) || defined(MINGW_ANY)
-/** The formatting string used to put a uint64_t value in a printf() or
- * scanf() function.  See also U64_PRINTF_ARG and U64_SCANF_ARG. */
-#define U64_FORMAT "%I64u"
-#define I64_FORMAT "%I64d"
-#else /* !(defined(_MSC_VER) || defined(MINGW_ANY)) */
-#define U64_FORMAT "%llu"
-#define I64_FORMAT "%lld"
-#endif /* defined(_MSC_VER) || defined(MINGW_ANY) */
-
-#if (SIZEOF_INTPTR_T == SIZEOF_INT)
-#define INTPTR_T_FORMAT "%d"
-#define INTPTR_PRINTF_ARG(x) ((int)(x))
-#elif (SIZEOF_INTPTR_T == SIZEOF_LONG)
-#define INTPTR_T_FORMAT "%ld"
-#define INTPTR_PRINTF_ARG(x) ((long)(x))
-#elif (SIZEOF_INTPTR_T == 8)
-#define INTPTR_T_FORMAT I64_FORMAT
-#define INTPTR_PRINTF_ARG(x) I64_PRINTF_ARG(x)
-#else
-#error Unknown: SIZEOF_INTPTR_T
-#endif /* (SIZEOF_INTPTR_T == SIZEOF_INT) || ... */
-
 /** Represents an mmaped file. Allocated via tor_mmap_file; freed with
  * tor_munmap_file. */
 typedef struct tor_mmap_t {
diff --git a/src/include.am b/src/include.am
index 974d572e2..d4b348b4e 100644
--- a/src/include.am
+++ b/src/include.am
@@ -1,5 +1,6 @@
 include src/ext/include.am
 include src/lib/err/include.am
+include src/lib/cc/include.am
 include src/lib/ctime/include.am
 include src/lib/compress/include.am
 include src/lib/trace/include.am
diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h
index a9a326616..31e84bcc5 100644
--- a/src/lib/cc/compat_compiler.h
+++ b/src/lib/cc/compat_compiler.h
@@ -194,4 +194,52 @@
 #define OP_EQ ==
 #define OP_NE !=
 
+#ifdef _MSC_VER
+/** Casts the uint64_t value in a to the right type for an argument
+ * to printf. */
+#define U64_PRINTF_ARG(a) (a)
+/** Casts the uint64_t* value in a to the right type for an argument
+ * to scanf. */
+#define U64_SCANF_ARG(a) (a)
+/** Expands to a literal uint64_t-typed constant for the value n. */
+#define U64_LITERAL(n) (n ## ui64)
+#define I64_PRINTF_ARG(a) (a)
+#define I64_SCANF_ARG(a) (a)
+#define I64_LITERAL(n) (n ## i64)
+#else /* !(defined(_MSC_VER)) */
+#define U64_PRINTF_ARG(a) ((long long unsigned int)(a))
+#define U64_SCANF_ARG(a) ((long long unsigned int*)(a))
+#define U64_LITERAL(n) (n ## llu)
+#define I64_PRINTF_ARG(a) ((long long signed int)(a))
+#define I64_SCANF_ARG(a) ((long long signed int*)(a))
+#define I64_LITERAL(n) (n ## ll)
+#endif /* defined(_MSC_VER) */
+
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#define MINGW_ANY
+#endif
+
+#if defined(_MSC_VER) || defined(MINGW_ANY)
+/** The formatting string used to put a uint64_t value in a printf() or
+ * scanf() function.  See also U64_PRINTF_ARG and U64_SCANF_ARG. */
+#define U64_FORMAT "%I64u"
+#define I64_FORMAT "%I64d"
+#else /* !(defined(_MSC_VER) || defined(MINGW_ANY)) */
+#define U64_FORMAT "%llu"
+#define I64_FORMAT "%lld"
+#endif /* defined(_MSC_VER) || defined(MINGW_ANY) */
+
+#if (SIZEOF_INTPTR_T == SIZEOF_INT)
+#define INTPTR_T_FORMAT "%d"
+#define INTPTR_PRINTF_ARG(x) ((int)(x))
+#elif (SIZEOF_INTPTR_T == SIZEOF_LONG)
+#define INTPTR_T_FORMAT "%ld"
+#define INTPTR_PRINTF_ARG(x) ((long)(x))
+#elif (SIZEOF_INTPTR_T == 8)
+#define INTPTR_T_FORMAT I64_FORMAT
+#define INTPTR_PRINTF_ARG(x) I64_PRINTF_ARG(x)
+#else
+#error Unknown: SIZEOF_INTPTR_T
+#endif /* (SIZEOF_INTPTR_T == SIZEOF_INT) || ... */
+
 #endif /* !defined(TOR_COMPAT_H) */



___

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit fa5fda5bbfd1c3ebcd9f01d0d86509c68dfd4268
Author: Nick Mathewson 
Date:   Thu Jun 21 12:20:52 2018 -0400

Rectify include paths (automated)
---
 src/common/address.h| 2 +-
 src/common/address_set.h| 2 +-
 src/common/buffers.c| 2 +-
 src/common/buffers.h| 2 +-
 src/common/buffers_tls.c| 2 +-
 src/common/compat.h | 4 ++--
 src/common/compat_threads.h | 2 +-
 src/common/crypto.c | 2 +-
 src/common/crypto.h | 2 +-
 src/common/crypto_curve25519.h  | 2 +-
 src/common/crypto_digest.h  | 2 +-
 src/common/crypto_ed25519.h | 2 +-
 src/common/crypto_format.h  | 2 +-
 src/common/crypto_pwbox.h   | 2 +-
 src/common/crypto_rand.h| 2 +-
 src/common/crypto_rsa.h | 2 +-
 src/common/crypto_s2k.h | 2 +-
 src/common/crypto_util.h| 2 +-
 src/common/sandbox.c| 2 +-
 src/common/sandbox.h| 2 +-
 src/common/token_bucket.h   | 2 +-
 src/common/util.c   | 2 +-
 src/common/util.h   | 2 +-
 src/common/util_format.c| 2 +-
 src/common/util_format.h| 2 +-
 src/ext/OpenBSD_malloc_Linux.c  | 2 +-
 src/ext/csiphash.c  | 2 +-
 src/ext/curve25519_donna/curve25519-donna-c64.c | 2 +-
 src/ext/curve25519_donna/curve25519-donna.c | 2 +-
 src/ext/ed25519/donna/ed25519_donna_tor.h   | 2 +-
 src/ext/ed25519/ref10/crypto_int32.h| 2 +-
 src/ext/ed25519/ref10/crypto_int64.h| 2 +-
 src/ext/ed25519/ref10/crypto_uint32.h   | 2 +-
 src/ext/ed25519/ref10/crypto_uint64.h   | 2 +-
 src/ext/ed25519/ref10/ed25519_ref10.h   | 2 +-
 src/ext/keccak-tiny/keccak-tiny.h   | 2 +-
 src/ext/mulodi/mulodi4.c| 2 +-
 src/lib/compress/compress.c | 2 +-
 src/lib/ctime/di_ops.h  | 2 +-
 src/lib/err/backtrace.h | 2 +-
 src/lib/err/torerr.h| 2 +-
 src/or/circuitlist.c| 2 +-
 src/or/dir_server_st.h  | 2 +-
 src/or/entry_port_cfg_st.h  | 2 +-
 src/or/keypin.c | 2 +-
 src/or/onion_ntor.h | 2 +-
 src/or/or.h | 2 +-
 47 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/common/address.h b/src/common/address.h
index 2c9c620c2..317c7f329 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -13,7 +13,7 @@
 
 //#include 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/container.h"
 
diff --git a/src/common/address_set.h b/src/common/address_set.h
index f4986c9b0..cfee89cfb 100644
--- a/src/common/address_set.h
+++ b/src/common/address_set.h
@@ -14,7 +14,7 @@
 #define TOR_ADDRESS_SET_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /**
  * An address_set_t represents a set of tor_addr_t values. The implementation
diff --git a/src/common/buffers.c b/src/common/buffers.c
index fd029c26c..41f98ddf7 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include 
diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5cd9d3ec6..5956e3484 100644
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -13,7 +13,7 @@
 #define TOR_BUFFERS_H
 
 #include "common/compat.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 typedef struct buf_t buf_t;
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index c380369b5..0a57b9552 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -12,7 +12,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/tortls.h"
 #ifdef HAVE_UNISTD_H
diff --git a/src/common/compat.h b/src/common/compat.h
index da9bd8bcc..0cc257fc9 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -14,7 +14,7 @@
 #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
 #endif
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include 
@@ -45,7

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit accf239fa3e84451711a25a96ddb13877fd9fcfa
Author: Nick Mathewson 
Date:   Thu Jun 21 12:47:11 2018 -0400

Rectify include paths (automated)
---
 src/common/address_set.c   |  2 +-
 src/common/compat_libevent.c   |  2 +-
 src/common/container.c |  2 +-
 src/common/util.c  |  2 +-
 src/common/workqueue.c |  2 +-
 src/ext/ed25519/donna/ed25519-hash-custom.h|  2 +-
 src/ext/ed25519/donna/ed25519-randombytes-custom.h |  2 +-
 src/ext/ed25519/donna/ed25519_tor.c|  2 +-
 src/ext/ed25519/ref10/blinding.c   |  2 +-
 src/ext/ed25519/ref10/crypto_hash_sha512.h |  2 +-
 src/ext/ed25519/ref10/keypair.c|  4 ++--
 src/ext/ed25519/ref10/randombytes.h|  2 +-
 src/ext/keccak-tiny/keccak-tiny-unrolled.c |  2 +-
 src/lib/crypt_ops/aes.c|  6 +++---
 src/lib/crypt_ops/compat_openssl.h |  2 +-
 src/lib/crypt_ops/crypto.c | 22 +++---
 src/lib/crypt_ops/crypto.h |  2 +-
 src/lib/crypt_ops/crypto_curve25519.c  | 10 +-
 src/lib/crypt_ops/crypto_curve25519.h  |  4 ++--
 src/lib/crypt_ops/crypto_dh.c  | 10 +-
 src/lib/crypt_ops/crypto_digest.c  |  6 +++---
 src/lib/crypt_ops/crypto_ed25519.c | 12 ++--
 src/lib/crypt_ops/crypto_ed25519.h |  2 +-
 src/lib/crypt_ops/crypto_format.c  | 10 +-
 src/lib/crypt_ops/crypto_format.h  |  2 +-
 src/lib/crypt_ops/crypto_hkdf.c|  8 
 src/lib/crypt_ops/crypto_openssl_mgt.c |  4 ++--
 src/lib/crypt_ops/crypto_pwbox.c   | 12 ++--
 src/lib/crypt_ops/crypto_rand.c|  6 +++---
 src/lib/crypt_ops/crypto_rsa.c | 16 
 src/lib/crypt_ops/crypto_rsa.h |  2 +-
 src/lib/crypt_ops/crypto_s2k.c | 12 ++--
 src/lib/crypt_ops/crypto_util.c|  2 +-
 src/lib/tls/buffers_tls.c  |  4 ++--
 src/lib/tls/tortls.c   | 11 +--
 src/lib/tls/tortls.h   |  4 ++--
 src/or/addressmap.c|  2 +-
 src/or/channelpadding.c|  2 +-
 src/or/circpathbias.c  |  2 +-
 src/or/circuitbuild.c  |  2 +-
 src/or/circuitlist.c   |  4 ++--
 src/or/circuitmux_ewma.c   |  2 +-
 src/or/circuitstats.c  |  2 +-
 src/or/command.c   |  2 +-
 src/or/config.c|  4 ++--
 src/or/connection.c|  4 ++--
 src/or/connection_edge.c   |  2 +-
 src/or/connection_or.c |  4 ++--
 src/or/conscache.c |  2 +-
 src/or/control.c   |  6 +++---
 src/or/cpuworker.c |  4 ++--
 src/or/dirauth/shared_random.c |  4 ++--
 src/or/dirauth/shared_random_state.c   |  2 +-
 src/or/directory.c |  4 ++--
 src/or/dns.c   |  2 +-
 src/or/dos.c   |  2 +-
 src/or/entrynodes.c|  2 +-
 src/or/ext_orport.c|  4 ++--
 src/or/hibernate.c |  2 +-
 src/or/hs_cache.c  |  2 +-
 src/or/hs_cache.h  |  2 +-
 src/or/hs_cell.c   |  2 +-
 src/or/hs_circuit.c|  4 ++--
 src/or/hs_circuit.h|  2 +-
 src/or/hs_client.c |  4 ++--
 src/or/hs_client.h |  2 +-
 src/or/hs_common.c |  4 ++--
 src/or/hs_control.c|  2 +-
 src/or/hs_descriptor.c |  4 ++--
 src/or/hs_descriptor.h |  4 ++--
 src/or/hs_ident.c  |  2 +-
 src/or/hs_ident.h  |  2 +-
 src/or/hs_intropoint.h |  2 +-
 src/or/hs_ntor.c   |  2 +-
 src/or/hs_service.c|  4 ++--
 src/or/hs_service.h|  4 ++--
 src/or/keypin.c|  4 ++--
 src/or/main.c  |  6 +++---

[tor-commits] [tor/master] di_ops.c does not actually log anything.

2018-06-21 Thread nickm
commit 68bbe915d909ba56a50a6d595eb6271967126a0e
Author: Nick Mathewson 
Date:   Thu Jun 21 12:28:33 2018 -0400

di_ops.c does not actually log anything.
---
 src/lib/ctime/di_ops.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c
index cc76be548..407131c44 100644
--- a/src/lib/ctime/di_ops.c
+++ b/src/lib/ctime/di_ops.c
@@ -8,7 +8,6 @@
 
 #include "orconfig.h"
 #include "lib/ctime/di_ops.h"
-#include "common/torlog.h"
 #include "common/util.h"
 
 /**
@@ -271,4 +270,3 @@ select_array_member_cumulative_timei(const uint64_t 
*entries, int n_entries,
 
   return i_chosen;
 }
-



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


[tor-commits] [tor/master] Move trace into its own library in libs.

2018-06-21 Thread nickm
commit 4bdda6d05faf24b4ff46bfcb7e40fb5d21e51259
Author: Nick Mathewson 
Date:   Thu Jun 21 12:02:14 2018 -0400

Move trace into its own library in libs.

Apparently it has no testing variant.
---
 .gitignore   |  1 +
 Makefile.am  |  4 ++--
 src/include.am   |  2 +-
 src/{ => lib}/trace/debug.h  |  0
 src/{ => lib}/trace/events.h |  0
 src/lib/trace/include.am | 18 ++
 src/{ => lib}/trace/trace.c  |  0
 src/{ => lib}/trace/trace.h  |  0
 src/trace/include.am | 19 ---
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14ab9f63c..2716bac83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,6 +173,7 @@ uptime-*.json
 /src/lib/libtor-ctime-testing.a
 /src/lib/libtor-err.a
 /src/lib/libtor-err-testing.a
+/src/lib/libtor-trace.a
 
 # /src/or/
 /src/or/Makefile
diff --git a/Makefile.am b/Makefile.am
index 5b229d073..62c0e2a4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ TOR_INTERNAL_LIBS = \
$(TOR_UTIL_LIBS) \
src/common/libor-event.a \
src/trunnel/libor-trunnel.a \
-   src/trace/libor-trace.a
+   src/lib/libtor-trace.a
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
@@ -82,7 +82,7 @@ TOR_INTERNAL_TESTING_LIBS = \
$(TOR_UTIL_TESTING_LIBS) \
src/common/libor-event-testing.a \
src/trunnel/libor-trunnel-testing.a \
-   src/trace/libor-trace.a
+   src/lib/libtor-trace.a
 
 # All libraries used to link tor-cov
 
diff --git a/src/include.am b/src/include.am
index a7b266aa3..974d572e2 100644
--- a/src/include.am
+++ b/src/include.am
@@ -2,6 +2,7 @@ include src/ext/include.am
 include src/lib/err/include.am
 include src/lib/ctime/include.am
 include src/lib/compress/include.am
+include src/lib/trace/include.am
 include src/common/include.am
 include src/trunnel/include.am
 include src/or/include.am
@@ -11,4 +12,3 @@ include src/tools/include.am
 include src/win32/include.am
 include src/config/include.am
 include src/test/fuzz/include.am
-include src/trace/include.am
diff --git a/src/trace/debug.h b/src/lib/trace/debug.h
similarity index 100%
rename from src/trace/debug.h
rename to src/lib/trace/debug.h
diff --git a/src/trace/events.h b/src/lib/trace/events.h
similarity index 100%
rename from src/trace/events.h
rename to src/lib/trace/events.h
diff --git a/src/lib/trace/include.am b/src/lib/trace/include.am
new file mode 100644
index 0..6f10c9874
--- /dev/null
+++ b/src/lib/trace/include.am
@@ -0,0 +1,18 @@
+
+noinst_LIBRARIES += \
+   src/lib/libtor-trace.a
+
+TRACEHEADERS = \
+   src/lib/trace/trace.h \
+   src/lib/trace/events.h
+
+if USE_EVENT_TRACING_DEBUG
+TRACEHEADERS += \
+   src/lib/trace/debug.h
+endif
+
+# Library source files.
+src_lib_libtor_trace_a_SOURCES = \
+   src/lib/trace/trace.c
+
+noinst_HEADERS+= $(TRACEHEADERS)
diff --git a/src/trace/trace.c b/src/lib/trace/trace.c
similarity index 100%
rename from src/trace/trace.c
rename to src/lib/trace/trace.c
diff --git a/src/trace/trace.h b/src/lib/trace/trace.h
similarity index 100%
rename from src/trace/trace.h
rename to src/lib/trace/trace.h
diff --git a/src/trace/include.am b/src/trace/include.am
deleted file mode 100644
index 5e5eaaf9b..0
--- a/src/trace/include.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-noinst_LIBRARIES += \
-   src/trace/libor-trace.a
-LIBOR_TRACE_A_SOURCES = \
-   src/trace/trace.c
-
-TRACEHEADERS = \
-   src/trace/trace.h \
-   src/trace/events.h
-
-if USE_EVENT_TRACING_DEBUG
-TRACEHEADERS += \
-   src/trace/debug.h
-endif
-
-# Library source files.
-src_trace_libor_trace_a_SOURCES = $(LIBOR_TRACE_A_SOURCES)
-
-noinst_HEADERS+= $(TRACEHEADERS)



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


[tor-commits] [tor/master] Remove unused pubsub module.

2018-06-21 Thread nickm
commit d2f4a716e8cc9aaa53b36d4e853769103ea35084
Author: Nick Mathewson 
Date:   Thu Jun 21 12:12:56 2018 -0400

Remove unused pubsub module.
---
 src/common/include.am  |   2 -
 src/common/pubsub.c| 129 ---
 src/common/pubsub.h| 179 -
 src/test/include.am|   1 -
 src/test/test.c|   2 -
 src/test/test.h|   2 -
 src/test/test_pubsub.c |  85 ---
 7 files changed, 400 deletions(-)

diff --git a/src/common/include.am b/src/common/include.am
index 5ed4b3c6d..0119b5cf1 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -68,7 +68,6 @@ LIBOR_A_SRC = \
   src/common/container.c   \
   src/common/log.c \
   src/common/memarea.c \
-  src/common/pubsub.c  \
   src/common/util.c\
   src/common/util_bug.c\
   src/common/util_format.c \
@@ -161,7 +160,6 @@ COMMONHEADERS = \
   src/common/memarea.h \
   src/common/linux_syscalls.inc\
   src/common/procmon.h \
-  src/common/pubsub.h  \
   src/common/sandbox.h \
   src/common/storagedir.h  \
   src/common/testsupport.h \
diff --git a/src/common/pubsub.c b/src/common/pubsub.c
deleted file mode 100644
index 93e8b5e6e..0
--- a/src/common/pubsub.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) 2016-2018, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-/**
- * \file pubsub.c
- *
- * \brief DOCDOC
- */
-
-#include "orconfig.h"
-#include "common/pubsub.h"
-#include "common/container.h"
-
-/** Helper: insert s into topic's list of subscribers, keeping
- * them sorted in priority order. */
-static void
-subscriber_insert(pubsub_topic_t *topic, pubsub_subscriber_t *s)
-{
-  int i;
-  smartlist_t *sl = topic->subscribers;
-  for (i = 0; i < smartlist_len(sl); ++i) {
-pubsub_subscriber_t *other = smartlist_get(sl, i);
-if (s->priority < other->priority) {
-  break;
-}
-  }
-  smartlist_insert(sl, i, s);
-}
-
-/**
- * Add a new subscriber to topic, where (when an event is triggered),
- * we'll notify the function fn by passing it subscriber_data.
- * Return a handle to the subscribe which can later be passed to
- * pubsub_unsubscribe_().
- *
- * Functions are called in priority order, from lowest to highest.
- *
- * See pubsub.h for subscribe_flags.
- */
-const pubsub_subscriber_t *
-pubsub_subscribe_(pubsub_topic_t *topic,
-  pubsub_subscriber_fn_t fn,
-  void *subscriber_data,
-  unsigned subscribe_flags,
-  unsigned priority)
-{
-  tor_assert(! topic->locked);
-  if (subscribe_flags & SUBSCRIBE_ATSTART) {
-tor_assert(topic->n_events_fired == 0);
-  }
-  pubsub_subscriber_t *r = tor_malloc_zero(sizeof(*r));
-  r->priority = priority;
-  r->subscriber_flags = subscribe_flags;
-  r->fn = fn;
-  r->subscriber_data = subscriber_data;
-  if (topic->subscribers == NULL) {
-topic->subscribers = smartlist_new();
-  }
-  subscriber_insert(topic, r);
-  return r;
-}
-
-/**
- * Remove the subscriber s from topic.  After calling this
- * function, s may no longer be used.
- */
-int
-pubsub_unsubscribe_(pubsub_topic_t *topic,
-const pubsub_subscriber_t *s)
-{
-  tor_assert(! topic->locked);
-  smartlist_t *sl = topic->subscribers;
-  if (sl == NULL)
-return -1;
-  int i = smartlist_pos(sl, s);
-  if (i == -1)
-return -1;
-  pubsub_subscriber_t *tmp = smartlist_get(sl, i);
-  tor_assert(tmp == s);
-  smartlist_del_keeporder(sl, i);
-  tor_free(tmp);
-  return 0;
-}
-
-/**
- * For every subscriber s in topic, invoke notify_fn on s and
- * event_data.  Return 0 if there were no nonzero return values, and -1 if
- * there were any.
- */
-int
-pubsub_notify_(pubsub_topic_t *topic, pubsub_notify_fn_t notify_fn,
-   void *event_data, unsigned notify_flags)
-{
-  tor_assert(! topic->locked);
-  (void) notify_flags;
-  smartlist_t *sl = topic->subscribers;
-  int n_bad = 0;
-  ++topic->n_events_fired;
-  if (sl == NULL)
-return -1;
-  topic->locked = 1;
-  SMARTLIST_FOREACH_BEGIN(sl, pubsub_subscriber_t *, s) {
-int r = notify_fn(s, event_data);
-if (r != 0)
-  ++n_bad;
-  } SMARTLIST_FOREACH_END(s);
-  topic->locked = 0;
-  return (n_bad == 0) ? 0 : -1;
-}
-
-/**
- * Release all storage held by topic.
- */
-void
-pubsub_clear_(pubsub_topic_t *topic)
-{
-  tor_assert(! topic->locked);
-
-  smartlist_t *sl = topic->subscribers;
-  if (sl == NULL)
-return;
-  SMARTLIST_FOREACH_BEGIN(sl, pubsub_subscriber_t *, s) {
-tor_free(s);
-  } SMARTLIST_FOREACH_END(s);
-  smartlist_free(sl);
-  topic->subscr

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit b420da4cf80e9fc53db0a085514b9491b750812f
Author: Nick Mathewson 
Date:   Thu Jun 21 11:52:01 2018 -0400

Rectify include paths (automated)
---
 src/common/buffers.c |  2 +-
 src/common/buffers_tls.c |  2 +-
 src/lib/compress/compress.c  | 10 +-
 src/lib/compress/compress_lzma.c |  4 ++--
 src/lib/compress/compress_none.c |  4 ++--
 src/lib/compress/compress_zlib.c |  4 ++--
 src/lib/compress/compress_zstd.c |  4 ++--
 src/or/circuitlist.c |  6 +++---
 src/or/config.c  |  2 +-
 src/or/main.c|  2 +-
 src/or/or.h  |  2 +-
 src/or/relay.c   |  2 +-
 src/test/test.c  |  2 +-
 src/test/test_dir_handle_get.c   |  2 +-
 src/test/test_util.c |  2 +-
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/common/buffers.c b/src/common/buffers.c
index 997bbdccc..fd029c26c 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -23,7 +23,7 @@
 #include 
 #include "common/buffers.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index dfc8e44b9..c380369b5 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -10,7 +10,7 @@
 #include "common/buffers.h"
 #include "common/buffers_tls.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 44bb891af..0d0c8112e 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -21,11 +21,11 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
-#include "common/compress_none.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_none.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 /** Total number of bytes allocated for compression state overhead. */
 static atomic_counter_t total_compress_allocation;
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 363dc1fb9..921aaa1d7 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
 
 #ifdef HAVE_LZMA
 #include 
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 7e67046d3..05a27e5cc 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -18,8 +18,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_none.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_none.h"
 
 /** Transfer some bytes using the identity transformation.  Read up to
  * *in_len bytes from *in, and write up to *out_len bytes
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 663e27f79..56dda8a2d 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zlib.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zlib.h"
 
 /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index dc0dcdec9..37204ab5e 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zstd.h"
 
 #ifdef ENABLE_ZSTD_ADVANCED_APIS
 /* This is a lie, but we make sure it doesn't get us in trouble by wrapping
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index c3d017bf8..1af970040 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -86,9 +86,9 @@
 #include "or/routerlist.h"
 #include "or/routerset.h"
 #include "or/channelpadding.h"
-#include "common/compress_lzma.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 #include "ht.h"
 
diff --git a/src/or/config.c b/src

[tor-commits] [tor/master] Make sure liberr-testing is build with testing flags.

2018-06-21 Thread nickm
commit 03d78126152bc79c82a4510fa654bb5a23c150cd
Author: Nick Mathewson 
Date:   Thu Jun 21 11:56:32 2018 -0400

Make sure liberr-testing is build with testing flags.
---
 src/lib/err/include.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/err/include.am b/src/lib/err/include.am
index 257ba3004..f2a409c51 100644
--- a/src/lib/err/include.am
+++ b/src/lib/err/include.am
@@ -11,6 +11,8 @@ src_lib_libtor_err_a_SOURCES =\
 
 src_lib_libtor_err_testing_a_SOURCES = \
$(src_lib_libtor_err_a_SOURCES)
+src_lib_libtor_err_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+src_lib_libtor_err_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=  \
src/lib/err/backtrace.h \



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


[tor-commits] [tor/master] Extract compression functions into a new library.

2018-06-21 Thread nickm
commit 2d20cbf837263898ce45c1e0a0f11b9e1126eeba
Author: Nick Mathewson 
Date:   Thu Jun 21 11:51:49 2018 -0400

Extract compression functions into a new library.
---
 .gitignore   |  2 ++
 Makefile.am  |  4 ++--
 src/common/include.am| 10 --
 src/include.am   |  1 +
 src/{common => lib/compress}/compress.c  |  0
 src/{common => lib/compress}/compress.h  |  0
 src/{common => lib/compress}/compress_lzma.c |  0
 src/{common => lib/compress}/compress_lzma.h |  0
 src/{common => lib/compress}/compress_none.c |  0
 src/{common => lib/compress}/compress_none.h |  0
 src/{common => lib/compress}/compress_zlib.c |  0
 src/{common => lib/compress}/compress_zlib.h |  0
 src/{common => lib/compress}/compress_zstd.c |  0
 src/{common => lib/compress}/compress_zstd.h |  0
 src/lib/compress/include.am  | 25 +
 15 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2267f5b4f..14ab9f63c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,6 +167,8 @@ uptime-*.json
 /src/ext/keccak-tiny/libkeccak-tiny.lib
 
 # /src/lib
+/src/lib/libtor-compress.a
+/src/lib/libtor-compress-testing.a
 /src/lib/libtor-ctime.a
 /src/lib/libtor-ctime-testing.a
 /src/lib/libtor-err.a
diff --git a/Makefile.am b/Makefile.am
index 59230ab75..5b229d073 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,7 @@ TOR_CRYPTO_TESTING_LIBS = \
 # All static libraries used to link tor.
 TOR_INTERNAL_LIBS = \
src/or/libtor-app.a \
+src/lib/libtor-compress.a \
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
src/common/libor-event.a \
@@ -76,10 +77,9 @@ TOR_INTERNAL_LIBS = \
 # and tests)
 TOR_INTERNAL_TESTING_LIBS = \
src/or/libtor-app-testing.a \
+src/lib/libtor-compress-testing.a \
$(TOR_CRYPTO_TESTING_LIBS) \
$(TOR_UTIL_TESTING_LIBS) \
-   $(LIBKECCAK_TINY) \
-   $(LIBDONNA) \
src/common/libor-event-testing.a \
src/trunnel/libor-trunnel-testing.a \
src/trace/libor-trace.a
diff --git a/src/common/include.am b/src/common/include.am
index fa12888ac..5ed4b3c6d 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -87,11 +87,6 @@ src/common/src_common_libor_testing_a-log.$(OBJEXT) \
 LIBOR_CRYPTO_A_SRC = \
   src/common/aes.c \
   src/common/buffers_tls.c \
-  src/common/compress.c\
-  src/common/compress_lzma.c   \
-  src/common/compress_none.c   \
-  src/common/compress_zlib.c   \
-  src/common/compress_zstd.c   \
   src/common/crypto.c  \
   src/common/crypto_dh.c   \
   src/common/crypto_digest.c \
@@ -147,11 +142,6 @@ COMMONHEADERS = \
   src/common/compat_openssl.h  \
   src/common/compat_threads.h  \
   src/common/compat_time.h \
-  src/common/compress.h\
-  src/common/compress_lzma.h   \
-  src/common/compress_none.h   \
-  src/common/compress_zlib.h   \
-  src/common/compress_zstd.h   \
   src/common/confline.h\
   src/common/container.h   \
   src/common/crypto.h  \
diff --git a/src/include.am b/src/include.am
index 296ac19b1..a7b266aa3 100644
--- a/src/include.am
+++ b/src/include.am
@@ -1,6 +1,7 @@
 include src/ext/include.am
 include src/lib/err/include.am
 include src/lib/ctime/include.am
+include src/lib/compress/include.am
 include src/common/include.am
 include src/trunnel/include.am
 include src/or/include.am
diff --git a/src/common/compress.c b/src/lib/compress/compress.c
similarity index 100%
rename from src/common/compress.c
rename to src/lib/compress/compress.c
diff --git a/src/common/compress.h b/src/lib/compress/compress.h
similarity index 100%
rename from src/common/compress.h
rename to src/lib/compress/compress.h
diff --git a/src/common/compress_lzma.c b/src/lib/compress/compress_lzma.c
similarity index 100%
rename from src/common/compress_lzma.c
rename to src/lib/compress/compress_lzma.c
diff --git a/src/common/compress_lzma.h b/src/lib/compress/compress_lzma.h
similarity index 100%
rename from src/common/compress_lzma.h
rename to src/lib/compress/compress_lzma.h
diff --git a/src/common/compress_none.c b/src/lib/compress/compress_none.c
similarity index 100%
rename from src/common/compress_none.c
rename to src/lib/compress/compress_none.c
diff --git a/src/common/compress_none.h b/src/lib/compress/compress_none.h
similarity index 100%
rename from src/common/compress_none.h
rename to src/lib/compress/compress_none.h
diff --git a/src/common/compress_zlib.c b/src/lib/compress/compress_zlib.c
similarity index 100%
rename from src/common/compress_zlib.c
rename to src/lib/compress/compress_zlib.c
diff --git a/src/common/compress_zlib.h b/src/lib/compress/compress_zl

[tor-commits] [translation/https_everywhere] Removing "ms" dead locale

2018-06-21 Thread translation
commit f152550e4c59efc0ac4dae04db896652d55c1e94
Author: Translation commit bot 
Date:   Thu Jun 21 17:22:38 2018 +

Removing "ms" dead locale
---
 ms/https-everywhere.dtd| 42 --
 ms/https-everywhere.properties |  7 ---
 2 files changed, 49 deletions(-)

diff --git a/ms/https-everywhere.dtd b/ms/https-everywhere.dtd
deleted file mode 100644
index b73224d5a..0
--- a/ms/https-everywhere.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ms/https-everywhere.properties b/ms/https-everywhere.properties
deleted file mode 100644
index 3cfced841..0
--- a/ms/https-everywhere.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-# https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-# https-everywhere.menu.enableDisable = Enable / Disable Rules
-# https-everywhere.menu.noRules = (No Rules for This Page)
-# https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can 
toggle it on a site-by-site basis by clicking the icon in the address bar.
-# https-everywhere.migration.notification0 = In order to implement a crucial 
fix, this update resets your HTTPS Everywhere rule preferences to their default 
values.

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


[tor-commits] [tor/master] tiny comment and whitespace fixes

2018-06-21 Thread arma
commit 471418befb9d1b30b17acd1e07a9d3de034db261
Author: Roger Dingledine 
Date:   Thu Jun 21 13:07:51 2018 -0400

tiny comment and whitespace fixes
---
 src/or/relay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 8a97d72f9..f74c4b4a9 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1796,15 +1796,15 @@ connection_edge_process_relay_cell(cell_t *cell, 
circuit_t *circ,
 return 0;
   }
 
-  /* Don't allow the other endpoint to request more than our maximim
-   * (ie initial) stream SENDME window worth of data. Well-behaved
+  /* Don't allow the other endpoint to request more than our maximum
+   * (i.e. initial) stream SENDME window worth of data. Well-behaved
* stock clients will not request more than this max (as per the check
* in the while loop of connection_edge_consider_sending_sendme()).
*/
   if (conn->package_window + STREAMWINDOW_INCREMENT >
   STREAMWINDOW_START_MAX) {
 static struct ratelim_t stream_warn_ratelim = RATELIM_INIT(600);
-log_fn_ratelim(&stream_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL,
+log_fn_ratelim(&stream_warn_ratelim, LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Unexpected stream sendme cell. Closing circ (window %d).",
conn->package_window);
 return -END_CIRC_REASON_TORPROTOCOL;

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


[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit 727db7aeb9e3e4355b9a2fd065f2b7e52f1082b1
Author: Nick Mathewson 
Date:   Thu Jun 21 10:53:36 2018 -0400

Rectify include paths (automated)
---
 src/common/aes.c | 2 +-
 src/common/crypto_pwbox.c| 2 +-
 src/common/util.h| 2 +-
 src/ext/ed25519/ref10/crypto_verify_32.h | 2 +-
 src/lib/ctime/di_ops.c   | 2 +-
 src/or/keypin.c  | 2 +-
 src/or/onion_ntor.h  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index bdefc2b55..70e48a74f 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "common/aes.h"
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 
 #ifdef ANDROID
 /* Android's OpenSSL seems to have removed all of its Engine support. */
diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c
index 5ffe138ee..799a8799e 100644
--- a/src/common/crypto_pwbox.c
+++ b/src/common/crypto_pwbox.c
@@ -14,7 +14,7 @@
 #include "common/crypto_rand.h"
 #include "common/crypto_s2k.h"
 #include "common/crypto_util.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/util.h"
 #include "trunnel/pwbox.h"
 
diff --git a/src/common/util.h b/src/common/util.h
index 8761e455f..b3c17db24 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -14,7 +14,7 @@
 #include "orconfig.h"
 #include "common/torint.h"
 #include "common/compat.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/testsupport.h"
 #include 
 #include 
diff --git a/src/ext/ed25519/ref10/crypto_verify_32.h 
b/src/ext/ed25519/ref10/crypto_verify_32.h
index f2000a321..529992875 100644
--- a/src/ext/ed25519/ref10/crypto_verify_32.h
+++ b/src/ext/ed25519/ref10/crypto_verify_32.h
@@ -1,4 +1,4 @@
 /* Added for Tor. */
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #define crypto_verify_32(a,b) \
   (! tor_memeq((a), (b), 32))
diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c
index 1ff1988b1..cc76be548 100644
--- a/src/lib/ctime/di_ops.c
+++ b/src/lib/ctime/di_ops.c
@@ -7,7 +7,7 @@
  **/
 
 #include "orconfig.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/torlog.h"
 #include "common/util.h"
 
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 402646028..921a401a4 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -14,7 +14,7 @@
 #include "common/compat.h"
 #include "common/crypto_digest.h"
 #include "common/crypto_format.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "ht.h"
 #include "or/keypin.h"
 #include "siphash.h"
diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h
index 3acb1eb62..13a3298ac 100644
--- a/src/or/onion_ntor.h
+++ b/src/or/onion_ntor.h
@@ -6,7 +6,7 @@
 
 #include "common/torint.h"
 #include "common/crypto_curve25519.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 
 /** State to be maintained by a client between sending an ntor onionskin
  * and receiving a reply. */



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


[tor-commits] [tor/master] Rename libtor.a to libtor-app.a

2018-06-21 Thread nickm
commit ad7776f66d3e914a0842c20f31162c0e11befa34
Author: Nick Mathewson 
Date:   Thu Jun 21 11:01:10 2018 -0400

Rename libtor.a to libtor-app.a
---
 .gitignore|  4 ++--
 Makefile.am   |  4 ++--
 src/or/include.am | 22 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6eb9530a9..2267f5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,8 +179,8 @@ uptime-*.json
 /src/or/tor.exe
 /src/or/tor-cov
 /src/or/tor-cov.exe
-/src/or/libtor.a
-/src/or/libtor-testing.a
+/src/or/libtor-app.a
+/src/or/libtor-app-testing.a
 /src/or/libtor.lib
 
 # /src/rust
diff --git a/Makefile.am b/Makefile.am
index 40ecfdae7..59230ab75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ TOR_CRYPTO_TESTING_LIBS = \
 
 # All static libraries used to link tor.
 TOR_INTERNAL_LIBS = \
-   src/or/libtor.a \
+   src/or/libtor-app.a \
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
src/common/libor-event.a \
@@ -75,7 +75,7 @@ TOR_INTERNAL_LIBS = \
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 TOR_INTERNAL_TESTING_LIBS = \
-   src/or/libtor-testing.a \
+   src/or/libtor-app-testing.a \
$(TOR_CRYPTO_TESTING_LIBS) \
$(TOR_UTIL_TESTING_LIBS) \
$(LIBKECCAK_TINY) \
diff --git a/src/or/include.am b/src/or/include.am
index 3c54551d7..a2532cd4d 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -1,9 +1,9 @@
 bin_PROGRAMS+= src/or/tor
 noinst_LIBRARIES += \
-   src/or/libtor.a
+   src/or/libtor-app.a
 if UNITTESTS_ENABLED
 noinst_LIBRARIES += \
-   src/or/libtor-testing.a
+   src/or/libtor-app-testing.a
 endif
 if COVERAGE_ENABLED
 noinst_PROGRAMS+= src/or/tor-cov
@@ -17,7 +17,7 @@ endif
 
 EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake
 
-LIBTOR_A_SOURCES = \
+LIBTOR_APP_A_SOURCES = \
src/or/addressmap.c \
src/or/bridges.c\
src/or/channel.c\
@@ -118,7 +118,7 @@ LIBTOR_A_SOURCES = \
 # source files of every module to libtor-testing.a so we can build the unit
 # tests for everything. See the UNITTESTS_ENABLED branch below.
 #
-LIBTOR_TESTING_A_SOURCES = $(LIBTOR_A_SOURCES)
+LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
 
 # The Directory Authority module.
 MODULE_DIRAUTH_SOURCES = \
@@ -127,18 +127,18 @@ MODULE_DIRAUTH_SOURCES = \
src/or/dirauth/shared_random.c  \
src/or/dirauth/shared_random_state.c
 if BUILD_MODULE_DIRAUTH
-LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
+LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
 endif
 
-src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
+src_or_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES)
 if UNITTESTS_ENABLED
 
 # Add the sources of the modules that are needed for tests to work here.
-LIBTOR_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
+LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
 
-src_or_libtor_testing_a_SOURCES = $(LIBTOR_TESTING_A_SOURCES)
+src_or_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES)
 else
-src_or_libtor_testing_a_SOURCES =
+src_or_libtor_app_testing_a_SOURCES =
 endif
 
 src_or_tor_SOURCES = src/or/tor_main.c
@@ -150,8 +150,8 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" 
\
-DLOCALSTATEDIR="\"$(localstatedir)\""  \
-DBINDIR="\"$(bindir)\""
 
-src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
-src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+src_or_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+src_or_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
 # This seems to matter nowhere but on windows, but I assure you that it

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


[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit 275aff6917260209dc53e553d895ec886f6c8c52
Author: Nick Mathewson 
Date:   Thu Jun 21 09:54:04 2018 -0400

Rectify include paths (automated)
---
 src/common/compat_time.c  | 2 +-
 src/common/log.c  | 2 +-
 src/common/sandbox.c  | 4 ++--
 src/common/util.c | 2 +-
 src/common/util.h | 2 +-
 src/common/util_bug.c | 2 +-
 src/lib/err/backtrace.c   | 6 +++---
 src/lib/err/torerr.c  | 4 ++--
 src/or/connection.c   | 2 +-
 src/or/connection_edge.c  | 2 +-
 src/or/directory.c| 2 +-
 src/or/main.c | 2 +-
 src/or/relay.c| 2 +-
 src/or/routerlist.c   | 2 +-
 src/test/fuzz/fuzz_http.c | 2 +-
 src/test/fuzz/fuzz_http_connect.c | 2 +-
 src/test/fuzz/fuzzing_common.c| 2 +-
 src/test/test.c   | 2 +-
 src/test/test_bt_cl.c | 2 +-
 src/test/test_logging.c   | 2 +-
 src/test/testing_common.c | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 913fa666e..da323e55a 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -34,7 +34,7 @@
 #include 
 #endif
 
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/container.h"
diff --git a/src/common/log.c b/src/common/log.c
index 6dba5bf4b..928a3fba8 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -34,7 +34,7 @@
 #define LOG_PRIVATE
 #include "common/torlog.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_ANDROID_LOG_H
 #include 
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 3679037f8..4fc132730 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -34,7 +34,7 @@
 
 #include "common/sandbox.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/torint.h"
 #include "common/util.h"
@@ -80,7 +80,7 @@
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
 #define USE_BACKTRACE
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */
 
 #ifdef USE_BACKTRACE
diff --git a/src/common/util.c b/src/common/util.c
index 664ab34d2..de46cc7c8 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -21,7 +21,7 @@
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/util_process.h"
 #include "common/util_format.h"
 
diff --git a/src/common/util.h b/src/common/util.h
index a5e6c4d46..8761e455f 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -22,7 +22,7 @@
 /* for the correct alias to struct stat */
 #include 
 #endif
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/util_bug.h"
 
 #ifndef O_BINARY
diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index da34201c1..5cfd00649 100644
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -10,7 +10,7 @@
 #include "orconfig.h"
 #include "common/util_bug.h"
 #include "common/torlog.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/container.h"
 
 #ifdef __COVERITY__
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d83cbba0e..cded6459f 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -14,7 +14,7 @@
  */
 
 #include "orconfig.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_EXECINFO_H
 #include 
@@ -45,8 +45,8 @@
 #endif
 
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
-#include "common/torerr.h"
+#include "lib/err/backtrace.h"
+#include "lib/err/torerr.h"
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index 0e0c4db35..81f360596 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -28,8 +28,8 @@
 #include 
 #endif
 
-#include "common/torerr.h"
-#include "common/backtrace.h"
+#include "lib/err/torerr.h"
+#include "lib/err/backtrace.h"
 
 /** Array of fds to log crash-style warnings to. */
 static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO };
diff --git a/src/or/connection.c b/src/or/connection.c
index 267719881..450903d6d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -65,7 +65,7 @@
  */
 #define TOR_CHANNEL_INTERNAL_
 #define CONNECTION_PRIVATE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 125709786..6d6279c83 100644
--- a/

[tor-commits] [tor/master] Extract error functionality into a new lowest-level library.

2018-06-21 Thread nickm
commit 2cfcb7b364541c27749ae0df73eabd7a56797f93
Author: Nick Mathewson 
Date:   Thu Jun 21 09:53:08 2018 -0400

Extract error functionality into a new lowest-level library.
---
 .gitignore  |  4 
 Makefile.am |  2 ++
 src/common/include.am   |  4 
 src/include.am  |  3 ++-
 src/{common => lib/err}/backtrace.c |  0
 src/{common => lib/err}/backtrace.h |  0
 src/lib/err/include.am  | 17 +
 src/{common => lib/err}/torerr.c|  0
 src/{common => lib/err}/torerr.h|  0
 src/rust/build.rs   |  3 ++-
 10 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3b13694a..517022399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,6 +166,10 @@ uptime-*.json
 /src/ext/keccak-tiny/libkeccak-tiny.a
 /src/ext/keccak-tiny/libkeccak-tiny.lib
 
+# /src/lib
+/src/lib/libtor-err.a
+/src/lib/libtor-err-testing.a
+
 # /src/or/
 /src/or/Makefile
 /src/or/Makefile.in
diff --git a/Makefile.am b/Makefile.am
index 579b9a089..6c60de111 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,12 +40,14 @@ endif
 # "Common" libraries used to link tor's utility code.
 TOR_UTIL_LIBS = \
src/common/libor.a \
+src/lib/libtor-err.a \
src/common/libor-ctime.a
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 TOR_UTIL_TESTING_LIBS = \
src/common/libor-testing.a \
+src/lib/libtor-err-testing.a \
src/common/libor-ctime-testing.a
 
 # Internal crypto libraries used in Tor
diff --git a/src/common/include.am b/src/common/include.am
index 8afec9c05..533703486 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -82,7 +82,6 @@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ 
$(TEST_CFLAGS)
 LIBOR_A_SRC = \
   src/common/address.c \
   src/common/address_set.c \
-  src/common/backtrace.c   \
   src/common/buffers.c \
   src/common/compat.c  \
   src/common/compat_threads.c  \
@@ -99,7 +98,6 @@ LIBOR_A_SRC = \
   src/common/sandbox.c \
   src/common/storagedir.c  \
   src/common/token_bucket.c\
-  src/common/torerr.c  \
   src/common/workqueue.c   \
   $(libor_extra_source)\
   $(threads_impl_source)   \
@@ -161,7 +159,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) 
$(TEST_CFLAGS)
 COMMONHEADERS = \
   src/common/address.h \
   src/common/address_set.h \
-  src/common/backtrace.h   \
   src/common/buffers.h \
   src/common/buffers_tls.h \
   src/common/aes.h \
@@ -203,7 +200,6 @@ COMMONHEADERS = \
   src/common/testsupport.h \
   src/common/timers.h  \
   src/common/token_bucket.h\
-  src/common/torerr.h  \
   src/common/torint.h  \
   src/common/torlog.h  \
   src/common/tortls.h  \
diff --git a/src/include.am b/src/include.am
index 90ecf90d4..424481485 100644
--- a/src/include.am
+++ b/src/include.am
@@ -1,6 +1,7 @@
 include src/ext/include.am
-include src/trunnel/include.am
+include src/lib/err/include.am
 include src/common/include.am
+include src/trunnel/include.am
 include src/or/include.am
 include src/rust/include.am
 include src/test/include.am
diff --git a/src/common/backtrace.c b/src/lib/err/backtrace.c
similarity index 100%
rename from src/common/backtrace.c
rename to src/lib/err/backtrace.c
diff --git a/src/common/backtrace.h b/src/lib/err/backtrace.h
similarity index 100%
rename from src/common/backtrace.h
rename to src/lib/err/backtrace.h
diff --git a/src/lib/err/include.am b/src/lib/err/include.am
new file mode 100644
index 0..257ba3004
--- /dev/null
+++ b/src/lib/err/include.am
@@ -0,0 +1,17 @@
+
+noinst_LIBRARIES += src/lib/libtor-err.a
+
+if UNITTESTS_ENABLED
+noinst_LIBRARIES += src/lib/libtor-err-testing.a
+endif
+
+src_lib_libtor_err_a_SOURCES = \
+   src/lib/err/backtrace.c \
+   src/lib/err/torerr.c
+
+src_lib_libtor_err_testing_a_SOURCES = \
+   $(src_lib_libtor_err_a_SOURCES)
+
+noinst_HEADERS +=  \
+   src/lib/err/backtrace.h \
+   src/lib/err/torerr.h
diff --git a/src/common/torerr.c b/src/lib/err/torerr.c
similarity index 100%
rename from src/common/torerr.c
rename to src/lib/err/torerr.c
diff --git a/src/common/torerr.h b/sr

[tor-commits] [tor/master] Refactor makefiles to keep list of internal libraries in one place.

2018-06-21 Thread nickm
commit b2346b12019c45288bbae3bd009fe0bafe80ff58
Author: Nick Mathewson 
Date:   Thu Jun 21 10:34:29 2018 -0400

Refactor makefiles to keep list of internal libraries in one place.

This change makes it possible for us to change the list of libraries
more easily, without changing every single linker line.
---
 Makefile.am  | 47 +
 src/or/include.am| 10 ++
 src/test/fuzz/include.am | 18 ++---
 src/test/include.am  | 50 +++-
 src/tools/include.am | 25 +++-
 5 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3c10c7f95..579b9a089 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,53 @@ else
 rust_ldadd=
 endif
 
+# "Common" libraries used to link tor's utility code.
+TOR_UTIL_LIBS = \
+   src/common/libor.a \
+   src/common/libor-ctime.a
+
+# Variants of the above for linking the testing variant of tor (for coverage
+# and tests)
+TOR_UTIL_TESTING_LIBS = \
+   src/common/libor-testing.a \
+   src/common/libor-ctime-testing.a
+
+# Internal crypto libraries used in Tor
+TOR_CRYPTO_LIBS = \
+   src/common/libor-crypto.a \
+   $(LIBKECCAK_TINY) \
+   $(LIBDONNA)
+
+# Variants of the above for linking the testing variant of tor (for coverage
+# and tests)
+TOR_CRYPTO_TESTING_LIBS = \
+   src/common/libor-crypto-testing.a \
+   $(LIBKECCAK_TINY) \
+   $(LIBDONNA)
+
+# All static libraries used to link tor.
+TOR_INTERNAL_LIBS = \
+   src/or/libtor.a \
+   $(TOR_CRYPTO_LIBS) \
+   $(TOR_UTIL_LIBS) \
+   src/common/libor-event.a \
+   src/trunnel/libor-trunnel.a \
+   src/trace/libor-trace.a
+
+# Variants of the above for linking the testing variant of tor (for coverage
+# and tests)
+TOR_INTERNAL_TESTING_LIBS = \
+   src/or/libtor-testing.a \
+   $(TOR_CRYPTO_TESTING_LIBS) \
+   $(TOR_UTIL_TESTING_LIBS) \
+   $(LIBKECCAK_TINY) \
+   $(LIBDONNA) \
+   src/common/libor-event-testing.a \
+   src/trunnel/libor-trunnel-testing.a \
+   src/trace/libor-trace.a
+
+# All libraries used to link tor-cov
+
 include src/include.am
 include doc/include.am
 include contrib/include.am
diff --git a/src/or/include.am b/src/or/include.am
index 19bcaec65..3c54551d7 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -159,10 +159,7 @@ src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) 
$(TEST_CFLAGS)
 
 
 src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ 
@TOR_LDFLAGS_libevent@
-src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a 
\
-   src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
-   src/common/libor-event.a src/trunnel/libor-trunnel.a \
-   src/trace/libor-trace.a \
+src_or_tor_LDADD = $(TOR_INTERNAL_LIBS) \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
@@ -174,10 +171,7 @@ src_or_tor_cov_SOURCES = src/or/tor_main.c
 src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ 
@TOR_LDFLAGS_libevent@
-src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
-   src/common/libor-ctime-testing.a \
-   src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
-   src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
+src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index cd16dc05b..46f74ee82 100644
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -7,14 +7,7 @@ FUZZING_CFLAGS = \
 FUZZING_LDFLAG = \
@TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
 FUZZING_LIBS = \
-   src/or/libtor-testing.a \
-   src/common/libor-crypto-testing.a \
-   $(LIBKECCAK_TINY) \
-   $(LIBDONNA) \
-   src/common/libor-testing.a \
-   src/common/libor-ctime-testing.a \
-   src/common/libor-event-testing.a \
-   src/trunnel/libor-trunnel-testing.a \
+   $(TOR_INTERNAL_TESTING_LIBS) \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
@TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@@ -24,14 +17,7 @@ FUZZING_LIBS = \
@TOR_ZSTD_LIBS@
 
 oss-fuzz-prereqs: \
-   src/or/libtor-testing.a \
-   src/common/libor-crypto-testing.a \
-   $(LIBKECCAK_TINY) \
-   $(LIBDONNA) \
-   src/common/libor-testing.a \
-   src/common/libor-ctime-testing.a \
-   src/common/libor-event-testing.a \
-   src/trunnel/libor-trunnel-testing.a
+ 

[tor-commits] [tor/master] Move consttime library code into its own directory.

2018-06-21 Thread nickm
commit a403ee6bb31168e19cf4173fff0e9acf9548231f
Author: Nick Mathewson 
Date:   Thu Jun 21 10:53:29 2018 -0400

Move consttime library code into its own directory.
---
 .gitignore |  2 ++
 Makefile.am|  4 ++--
 src/common/include.am  | 23 ---
 src/include.am |  1 +
 src/{common => lib/ctime}/di_ops.c |  0
 src/{common => lib/ctime}/di_ops.h |  0
 src/lib/ctime/include.am   | 25 +
 src/rust/build.rs  |  3 +--
 8 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 517022399..6eb9530a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,6 +167,8 @@ uptime-*.json
 /src/ext/keccak-tiny/libkeccak-tiny.lib
 
 # /src/lib
+/src/lib/libtor-ctime.a
+/src/lib/libtor-ctime-testing.a
 /src/lib/libtor-err.a
 /src/lib/libtor-err-testing.a
 
diff --git a/Makefile.am b/Makefile.am
index 6c60de111..40ecfdae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,14 +41,14 @@ endif
 TOR_UTIL_LIBS = \
src/common/libor.a \
 src/lib/libtor-err.a \
-   src/common/libor-ctime.a
+   src/lib/libtor-ctime.a
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 TOR_UTIL_TESTING_LIBS = \
src/common/libor-testing.a \
 src/lib/libtor-err-testing.a \
-   src/common/libor-ctime-testing.a
+src/lib/libtor-ctime-testing.a
 
 # Internal crypto libraries used in Tor
 TOR_CRYPTO_LIBS = \
diff --git a/src/common/include.am b/src/common/include.am
index 533703486..fa12888ac 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -1,14 +1,12 @@
 
 noinst_LIBRARIES += \
src/common/libor.a \
-   src/common/libor-ctime.a \
src/common/libor-crypto.a \
src/common/libor-event.a
 
 if UNITTESTS_ENABLED
 noinst_LIBRARIES += \
src/common/libor-testing.a \
-   src/common/libor-ctime-testing.a \
src/common/libor-crypto-testing.a \
src/common/libor-event-testing.a
 endif
@@ -59,26 +57,6 @@ else
 readpassphrase_source=
 endif
 
-if ADD_MULODI4
-mulodi4_source=src/ext/mulodi/mulodi4.c
-else
-mulodi4_source=
-endif
-
-LIBOR_CTIME_A_SRC = \
-   $(mulodi4_source) \
-   src/ext/csiphash.c   \
-   src/common/di_ops.c
-
-src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC)
-if UNITTESTS_ENABLED
-src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC)
-else
-src_common_libor_ctime_testing_a_SOURCES =
-endif
-src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@
-src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS)
-
 LIBOR_A_SRC = \
   src/common/address.c \
   src/common/address_set.c \
@@ -189,7 +167,6 @@ COMMONHEADERS = \
   src/common/crypto_rsa.h   \
   src/common/crypto_s2k.h  \
   src/common/crypto_util.h \
-  src/common/di_ops.h  \
   src/common/handles.h \
   src/common/memarea.h \
   src/common/linux_syscalls.inc\
diff --git a/src/include.am b/src/include.am
index 424481485..296ac19b1 100644
--- a/src/include.am
+++ b/src/include.am
@@ -1,5 +1,6 @@
 include src/ext/include.am
 include src/lib/err/include.am
+include src/lib/ctime/include.am
 include src/common/include.am
 include src/trunnel/include.am
 include src/or/include.am
diff --git a/src/common/di_ops.c b/src/lib/ctime/di_ops.c
similarity index 100%
rename from src/common/di_ops.c
rename to src/lib/ctime/di_ops.c
diff --git a/src/common/di_ops.h b/src/lib/ctime/di_ops.h
similarity index 100%
rename from src/common/di_ops.h
rename to src/lib/ctime/di_ops.h
diff --git a/src/lib/ctime/include.am b/src/lib/ctime/include.am
new file mode 100644
index 0..b46c43ba0
--- /dev/null
+++ b/src/lib/ctime/include.am
@@ -0,0 +1,25 @@
+
+noinst_LIBRARIES += src/lib/libtor-ctime.a
+
+if UNITTESTS_ENABLED
+noinst_LIBRARIES += src/lib/libtor-ctime-testing.a
+endif
+
+if ADD_MULODI4
+mulodi4_source=src/ext/mulodi/mulodi4.c
+else
+mulodi4_source=
+endif
+
+src_lib_libtor_ctime_a_SOURCES =   \
+   $(mulodi4_source)   \
+   src/ext/csiphash.c  \
+   src/lib/ctime/di_ops.c
+
+src_lib_libtor_ctime_testing_a_SOURCES = \
+   $(src_lib_libtor_ctime_a_SOURCES)
+src_lib_libtor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@
+src_lib_libtor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS)
+
+noinst_HEADERS += \
+   src/lib/ctime/di_ops.h
diff --git a/src/rust/build.rs b/src/rust/build.rs
index 32000b12f..f9b40689f 100644
--- a/src/rust/build.rs
+++ b/src/rust/build.rs
@@ -150,11 +150,10 @@ pub fn main() {
 // tor uses.  We must be careful with factoring and dependencies
 // moving forward!
 cfg.component("or-crypto-testing");

[tor-commits] [tor-browser-build/master] Bug 26440: move vaulted vars to a separate directory

2018-06-21 Thread gk
commit 2baf11975323cffae6a993fb5a2f57236f7c880d
Author: Nicolas Vigier 
Date:   Thu Jun 21 16:27:50 2018 +0200

Bug 26440: move vaulted vars to a separate directory
---
 tools/ansible/boklm-tbb-nightly-build.yml   | 2 ++
 .../ansible/{group_vars => vaulted_vars}/boklm-tbb-nightly/dma-auth.yml | 0
 2 files changed, 2 insertions(+)

diff --git a/tools/ansible/boklm-tbb-nightly-build.yml 
b/tools/ansible/boklm-tbb-nightly-build.yml
index 2fe48cd..dd9e1dc 100644
--- a/tools/ansible/boklm-tbb-nightly-build.yml
+++ b/tools/ansible/boklm-tbb-nightly-build.yml
@@ -6,3 +6,5 @@
   - role: tbb-nightly-build
   - role: unattended-upgrades
   - role: mta
+  vars_files:
+  - vaulted_vars/boklm-tbb-nightly/dma-auth.yml
diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml 
b/tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml
similarity index 100%
rename from tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml
rename to tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml

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


  1   2   >