December 2016 - tor-commits - lists.torproject.org

[trac-email/master] Clean up scripts and set log messages
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 5e70f3018f6515ab3a1165e2096dc6eb13d5dc6e Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 12:37:56 2016 +0100 Clean up scripts and set log messages --- notify.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/notify.py b/notify.py index 25992d4..9224231 100755 --- a/notify.py +++ b/notify.py @@ -15,7 +15,7 @@ def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') verified = gpg.verify(message) if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: - with open('bin/map', 'rb') as csvfile: + with open('/home/tracadm/bin/map', 'rb') as csvfile: keysreader = csv.reader(csvfile, delimiter=' ') for row in keysreader: k = row[0] @@ -50,7 +50,10 @@ def find_or_create_ticket(message, env): t_id = ticket_id.group(1) tkt = Ticket(env, int(t_id)) if verify_user_permissions(env, reporter, 'TICKET_MODIFY'): - tkt.save_changes(comment=body) + if tkt.save_changes(comment=body): + return tkt + else: + return False else: if verify_user_permissions(env, reporter, 'TICKET_CREATE'): summary = message['Subject'] @@ -64,7 +67,10 @@ def find_or_create_ticket(message, env): tkt['description'] = body tkt['status'] = 'new' tkt['priority'] = 'medium' - tkt.insert() + if tkt.insert(): + return tkt + else: + return False # Open logs file with open('/home/tracadm/log/test.log', 'w') as f: @@ -82,4 +88,10 @@ with open('/home/tracadm/log/test.log', 'w') as f: if verified: # Find or create ticket f.write('GPG verified') - find_or_create_ticket(msg, env) + tkt = find_or_create_ticket(msg, env) + if tkt: + f.write(str(tkt)) + else: + f.write('Could not create Ticket. I should send an email back I suppose') + else: + f.write('Could not verify GPG. I should send an email back I suppose')

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit e8e497070168189d21c6208978e33a8d2dcd78dc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 11:18:18 2016 +0000 Update translations for tor-browser-manual --- bg/bg.po | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 13db52b..bc55ede 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -921,6 +921,8 @@ msgid "" "Tor Browser features “New Identity” and “New Tor Circuit for this Site” " "options, located in the Torbutton menu." msgstr "" +"Tor браъзърът включва опциите \"Нов самоличност\" и \"Нова Тor верига за " +"този сайт\", които се намират в менюто на Tor бутона." #: managing-identities.page:111 msgid "New Identity" @@ -935,6 +937,13 @@ 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 "" +"Тази опция е полезна ако желаете да избегнете свързването на понататъчните " +"Ви действия с това, което сте направили преди. Избирането на тази опция ще " +"затвори всички отворени табове и прозорци, ще изтрие всяка лична информация " +"като бисквитки и историята на сърфирането, и ще използва нова Тор верига за " +"всички връзки. Tor браузърът ще предупреди, че всички текущи действия и " +"тегления ще бъдат преустановени, така че имайте това предвид преди да " +"натиснете \"Нова самоличност\"" #: managing-identities.page:123 msgid "New Tor Circuit for this Site" @@ -951,32 +960,44 @@ msgid "" "or unlink your activity, nor does it affect your current connections to " "other websites." msgstr "" +"Тази опция е полезна ако <link xref=\"about-tor-browser#how-tor-" +"works\">последният препращач</link>, който използвате не може да се свърже с" +" уебсайта, който искате, или ако не се зарежда правилно. Избирането ѝ ще " +"презареди вече отворените табове и прозорци през нова Tor верига. Тази опция" +" не изтрива никаква лична информация и не премахва връзката с действията Ви," +" нито променя връзката с други уебсайтове." #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Услуги, които са достъпни само през Tor" #: onionsites.page:10 msgid "Onion Services" -msgstr "" +msgstr "Onion услуги" #: onionsites.page:11 msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Onion услуги(преди така наречените \"скрити услуги\") са услуги(примерно " +"уебсайтове), които са достъпни само през Tor мрежата." #: onionsites.page:16 msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" +"Onion услугите имат няколко преимущества спрямо обикновените услуги в " +"интернет:" #: onionsites.page:23 msgid "" "An onion services’s location and IP address are hidden, making it difficult " "for adversaries to censor it or identify its operators." msgstr "" +"Местоположението и IP адресът на оnion услугата са скрити, което прави " +"трудно за враговете да цензурират или идентифицират операторът ѝ." #: onionsites.page:29 msgid "" @@ -984,6 +1005,9 @@ msgid "" " you do not need to worry about <link xref=\"secure-connections\">connecting" " over HTTPS</link>." msgstr "" +"Целият трафик между Tor потребителя и onion услугите са криптирани от край " +"до край, така че не е нужно да се притеснявате дали <link xref=\"secure-" +"connections\">връзката минава през HTTPS</link>." #: onionsites.page:36 msgid "" @@ -992,10 +1016,13 @@ msgid "" " that it is connecting to the right location and that the connection is not " "being tampered with." msgstr "" +"Адресът на onion услугата е автоматично генериран, така че операторите няма " +"нужда да купуват домейни; .onion URL-ът също помага на Tor да се увери, че " +"се свързва с правилната дестинация и че връзката не е подправена." #: onionsites.page:46 msgid "How to access an onion service" -msgstr "" +msgstr "Как да посетите onion услуга" #. 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 @@ -1007,6 +1034,8 @@ msgid "" "external ref='media/onionsites/onion_url.png' " "md5='f97f7fe10f07c3959c4430934974bbaa'" msgstr "" +"external ref='media/onionsites/onion_url.png' " +"md5='f97f7fe10f07c3959c4430934974bbaa'" #: onionsites.page:50 msgid "" @@ -1014,10 +1043,13 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Точно както всеки друг уебсайт, ще трябва да знаете интернет адресът на " +"onion услугата, за да може се свържете с нея. Onion адресът е текст от " +"шестнадест най-вече произволни букви и цифри, следвани от \".onion\"." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" -msgstr "" +msgstr "Решаване на проблеми" #: onionsites.page:59 msgid "" @@ -1025,6 +1057,9 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Ако не можете да се свържете с onion услуга се уверете, че сте въвели " +"16-буквеният onion адрес правилно: дори и малка печатна грешка ще попречи на" +" Tor браузъра да достигне уебсайта." #: onionsites.page:64 msgid "" @@ -1032,6 +1067,9 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" +"Ако все още неможете да се свържете с onion услугата, моля опитайте по-" +"късно. Чест има временни проблеми с връзката или операторите на уебсайта са " +"го спрели без предупреждение." #: onionsites.page:69 msgid "" @@ -1039,18 +1077,21 @@ msgid "" "connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's " "Onion Service</link>" msgstr "" +"Може да се уверите, че имате достъп до onion услугите като се свържете с " +"<link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion " +"Service</link>" #: plugins.page:6 msgid "How Tor Browser handles add-ons, plugins and JavaScript" -msgstr "" +msgstr "Как Tor браузърът третира добавки, плугини и JavaScript" #: plugins.page:10 msgid "Plugins, add-ons and JavaScript" -msgstr "" +msgstr "Плугини, добавки и JavaScript" #: plugins.page:13 msgid "Flash Player" -msgstr "" +msgstr "Flash плеър" #: plugins.page:14 msgid "" @@ -1061,6 +1102,13 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" +"Видео уебсайтове като Vimeo използват Flash плеър плугин, за да покажат " +"видео съдържание. За жалост, този софтуер работи отделно от Tor браузъра и " +"не може лесно да бъде накаран да следва прокси настройките на Tor браузъра. " +"Следователно може да разкрие реалното Ви местоположение и IP адрес на " +"операторите на уебсайта или на други наблюдатели. Поради тази причина Flash " +"е изключен по подразбиране в Tor браузъра и активирането му не е " +"препоръчително." #: plugins.page:23 msgid "" @@ -1068,10 +1116,12 @@ msgid "" "methods that do not use Flash. These methods may be compatible with Tor " "Browser." msgstr "" +"Някои видео сайтове(като YouTube) предлагат алтернативни методи за видео, " +"които не използват Flash. Тези методи са съвместими с Tor браузъра." #: plugins.page:31 msgid "JavaScript" -msgstr "" +msgstr "JavaScript" #: plugins.page:32 msgid "" @@ -1080,6 +1130,10 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"JavaScript е програмен език, който се използва от уебсайтове за интерактивни" +" елементи като видео, анимация, аудио и състояние на статуса. За съжаление," +" JavaScript може също така да бъде използван за атакуване на сигурноста на " +"браузъра, което може да доведе до денаномизация." #: plugins.page:39 msgid "" @@ -1087,6 +1141,10 @@ msgid "" "icon at the top-left of the window, which allows you to control the " "JavaScript that runs on individual web pages, or to block it entirely." msgstr "" +"Tor браузърът използва добавка наречена NoScript, достъпна през иконата " +"\"S\" в горния ляв ъгъл на екрана, която Ви дава контрол над JavaScript-ът, " +"който върви на всяка индивидуална страница или разрешава пълното му " +"блокиране." #. 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 @@ -1098,6 +1156,8 @@ msgid "" "external ref='media/plugins/noscript_menu.png' " "md5='df9e684b76a3c2e2bdcb879a19c20471'" msgstr "" +"external ref='media/plugins/noscript_menu.png' " +"md5='df9e684b76a3c2e2bdcb879a19c20471'" #: plugins.page:47 msgid "" @@ -1108,16 +1168,25 @@ msgid "" " many websites from displaying correctly, so Tor Browser’s default setting " "is to allow all websites to run scripts." msgstr "" +"Потребители, които изискват високо ниво на сигурност на интернет сърфирането" +" би трябвало да сложат <link xref=\"security-slider\">Плъзгача по " +"сигурноста</link> на \"Средно-Високо\" (което изключва JavaScript за " +"уебсайтове без HTTPS) или на \"Високо\"(което прави същото за всички " +"уебсайтове). Обаче, изключването на JavaScript ще попречи на много сайтове " +"да се изобразят правилно, така че настройките по подразбиране разрешават " +"изпълняването на JavaScript на всички уебсайтове." #: plugins.page:58 msgid "Browser Add-ons" -msgstr "" +msgstr "Браузърни добавки" #: plugins.page:59 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 браузърът е базиран на Firefox, и всички добавки или теми, които са " +"съвместими с Firefox могат да бъдат инсталирани и в Tor." #: plugins.page:64 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit a7b316b58223cb065267ec668b90a9e651141cf2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 08:19:55 2016 +0000 Update translations for tor-browser-manual --- cy/cy.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/cy.po b/cy/cy.po index fd73468..d20bb64 100644 --- a/cy/cy.po +++ b/cy/cy.po @@ -1,5 +1,5 @@ # Translators: -# Christopher Griffiths <transifex(a)cgriff.co.uk>, 2016 +# ianto <transifex(a)cgriff.co.uk>, 2016 # Huw Waters <huwwaters(a)gmail.com>, 2016 # Tor Project <support-team-private(a)lists.torproject.org>, 2016 msgid ""

1 0

[tor/master] Merge remote-tracking branch 'teor/fix-frac-paths-comment'
by nickm＠torproject.org 14 Dec '16

14 Dec '16

commit 963e70673a01f0cdea1e5533b02128a84dfaa0d8 Merge: 387de08 e2537a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 13 20:30:51 2016 -0500 Merge remote-tracking branch 'teor/fix-frac-paths-comment' src/or/nodelist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Clarify a comment in compute_frac_paths_available
by nickm＠torproject.org 14 Dec '16

14 Dec '16

commit e2537a5982b9003b14daee768cae33561f5f04bd Author: teor <teor2345(a)gmail.com> Date: Wed Dec 14 10:25:01 2016 +1100 Clarify a comment in compute_frac_paths_available --- src/or/nodelist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 3f2e111..2bcedbf 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1728,9 +1728,9 @@ count_usable_descriptors(int *num_present, int *num_usable, * If **<b>status_out</b> is present, allocate a new string and print the * available percentages of guard, middle, and exit nodes to it, noting * whether there are exits in the consensus. - * If there are no guards in the consensus, - * we treat the exit fraction as 100%. - */ + * If there are no exits in the consensus, we treat the exit fraction as 100%, + * but set router_have_consensus_path() so that we can only build internal + * paths. */ static double compute_frac_paths_available(const networkstatus_t *consensus, const or_options_t *options, time_t now,

1 0

[tor/master] Remove AuthDirMaxServersPerAuthAddr
by nickm＠torproject.org 13 Dec '16

13 Dec '16

commit 55d02c004c9b36258ef64ccb2def4ddcb0fb04c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 13 13:09:27 2016 -0500 Remove AuthDirMaxServersPerAuthAddr Back when Roger had do do most of our testing on the moria host, we needed a higher limit for the number of relays running on a single IP address when that limit was shared with an authority. Nowadays, the idea is pretty obsolete. Also remove the router_addr_is_trusted_dir() function, which served no other purpose. Closes ticket 20960. --- changes/ticket20960 | 5 +++++ doc/tor.1.txt | 4 ---- src/or/config.c | 3 +-- src/or/dirserv.c | 8 +------- src/or/or.h | 3 --- src/or/routerlist.c | 14 -------------- src/or/routerlist.h | 1 - 7 files changed, 7 insertions(+), 31 deletions(-) diff --git a/changes/ticket20960 b/changes/ticket20960 new file mode 100644 index 0000000..3c21ae6 --- /dev/null +++ b/changes/ticket20960 @@ -0,0 +1,5 @@ + o Removed features: + - The AuthDirMaxServersPerAuthAddr option no longer exists: The same + limit for relays running on a single IP applies to authority IP + addresses as well as to non-authority IP addresses. Closes ticket + 20960. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9b8a0f0..eef7454 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2246,10 +2246,6 @@ on the public Tor network. list as acceptable on a single IP address. Set this to "0" for "no limit". (Default: 2) -[[AuthDirMaxServersPerAuthAddr]] **AuthDirMaxServersPerAuthAddr** __NUM__:: - Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies - to addresses shared with directory authorities. (Default: 5) - [[AuthDirFastGuarantee]] **AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: Authoritative directories only. If non-zero, always vote the Fast flag for any relay advertising this amount of capacity or diff --git a/src/or/config.c b/src/or/config.c index a4d063d..c68f83a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -218,7 +218,7 @@ static config_var_t option_vars_[] = { OBSOLETE("AuthDirListBadDirs"), V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), - V(AuthDirMaxServersPerAuthAddr,UINT, "5"), + OBSOLETE("AuthDirMaxServersPerAuthAddr"), V(AuthDirHasIPv6Connectivity, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), @@ -594,7 +594,6 @@ static const config_var_t testing_tor_network_defaults[] = { V(EnforceDistinctSubnets, BOOL, "0"), V(AssumeReachable, BOOL, "1"), V(AuthDirMaxServersPerAddr, UINT, "0"), - V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, "0, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), V(ClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e106628..4d349dd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2056,12 +2056,8 @@ get_possible_sybil_list(const smartlist_t *routers) int addr_count; /* Allow at most this number of Tor servers on a single IP address, ... */ int max_with_same_addr = options->AuthDirMaxServersPerAddr; - /* ... unless it's a directory authority, in which case allow more. */ - int max_with_same_addr_on_authority = options->AuthDirMaxServersPerAuthAddr; if (max_with_same_addr <= 0) max_with_same_addr = INT_MAX; - if (max_with_same_addr_on_authority <= 0) - max_with_same_addr_on_authority = INT_MAX; smartlist_add_all(routers_by_ip, routers); smartlist_sort(routers_by_ip, compare_routerinfo_by_ip_and_bw_); @@ -2074,9 +2070,7 @@ get_possible_sybil_list(const smartlist_t *routers) last_addr = ri->addr; addr_count = 1; } else if (++addr_count > max_with_same_addr) { - if (!router_addr_is_trusted_dir(ri->addr) || - addr_count > max_with_same_addr_on_authority) - digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri); + digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri); } } SMARTLIST_FOREACH_END(ri); diff --git a/src/or/or.h b/src/or/or.h index 0e508e9..cfbd7b5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3969,9 +3969,6 @@ typedef struct { * and vote for all other exits as good. */ int AuthDirMaxServersPerAddr; /**< Do not permit more than this * number of servers per IP address. */ - int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this - * number of servers per IP address shared - * with an authority. */ int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6? */ int AuthDirPinKeys; /**< Boolean: Do we enforce key-pinning? */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 46c44d8..69ae51a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2991,20 +2991,6 @@ router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type) return 0; } -/** Return true iff <b>addr</b> is the address of one of our trusted - * directory authorities. */ -int -router_addr_is_trusted_dir(uint32_t addr) -{ - if (!trusted_dir_servers) - return 0; - SMARTLIST_FOREACH(trusted_dir_servers, dir_server_t *, ent, - if (ent->addr == addr) - return 1; - ); - return 0; -} - /** If hexdigest is correctly formed, base16_decode it into * digest, which must have DIGEST_LEN space in it. * Return 0 on success, -1 on failure. diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 606e908..8b68d69 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -86,7 +86,6 @@ int router_digest_is_trusted_dir_type(const char *digest, #define router_digest_is_trusted_dir(d) \ router_digest_is_trusted_dir_type((d), NO_DIRINFO) -int router_addr_is_trusted_dir(uint32_t addr); int hexdigest_to_digest(const char *hexdigest, char *digest); const routerinfo_t *router_get_by_id_digest(const char *digest); routerinfo_t *router_get_mutable_by_digest(const char *digest);

1 0

[tor/master] Merge branch 'ticket20960'
by nickm＠torproject.org 13 Dec '16

13 Dec '16

commit 387de08fb43a7f2ffd8a45a5452f950a99ed56b1 Merge: 56b1190 55d02c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 13 18:03:43 2016 -0500 Merge branch 'ticket20960' changes/ticket20960 | 5 +++++ doc/tor.1.txt | 4 ---- src/or/config.c | 3 +-- src/or/dirserv.c | 8 +------- src/or/or.h | 3 --- src/or/routerlist.c | 14 -------------- src/or/routerlist.h | 1 - 7 files changed, 7 insertions(+), 31 deletions(-)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 13 Dec '16

13 Dec '16

commit a85486c0ede18aa3e10d6208cbb5f30e2fa4f2bf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 13 22:48:19 2016 +0000 Update translations for tor-browser-manual --- fr/fr.po | 17 ++++++++++++++--- fr_CA/fr_CA.po | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 74eeb2b..b107b8c 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1543,28 +1543,34 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 donne l'impression que le trafic Tor est aléatoire, comme obfs3, et " +"empêche aussi les censeurs de trouver des ponts en balayant l'Internet. Les " +"ponts obfs4 sont moins susceptibles d'être bloqués que les ponts obfs3." #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." msgstr "" +"ScrambleSuit est semblable à obfs4 mais offre un jeu différent de ponts." #: transports.page:69 msgid "FTE" -msgstr "" +msgstr "FTE" #: transports.page:74 msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." msgstr "" +"FTE (chiffrement par transformation du format) déguise le trafic Tor en " +"trafic Web ordinaire (HTTP)." #: transports.page:82 msgid "meek" -msgstr "" +msgstr "meek" #: transports.page:87 msgid "" @@ -1573,6 +1579,11 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" +"Tous ces transports donnent l'impression que vous parcourez l'un des grands " +"sites Web au lieu d'utiliser Tor. meek-amazon donne l'impression que vous " +"utilisez les services Web d'Amazon ; meek-azure donne l'impression que vous " +"utilisez un site Web de Microsoft ; et meek-google l'impression que vous " +"utilisez la recherche Google." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 8c6a908..e3e8da5 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -1535,28 +1535,34 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 donne l'impression que le trafic Tor est aléatoire, comme obfs3, et " +"empêche aussi les censeurs de trouver des ponts en balayant l'Internet. Les " +"ponts obfs4 sont moins susceptibles d'être bloqués que les ponts obfs3." #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." msgstr "" +"ScrambleSuit est semblable à obfs4 mais offre un jeu différent de ponts." #: transports.page:69 msgid "FTE" -msgstr "" +msgstr "FTE" #: transports.page:74 msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." msgstr "" +"FTE (chiffrement par transformation du format) déguise le trafic Tor en " +"trafic Web ordinaire (HTTP)." #: transports.page:82 msgid "meek" -msgstr "" +msgstr "meek" #: transports.page:87 msgid "" @@ -1565,6 +1571,11 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" +"Tous ces transports donnent l'impression que vous parcourez l'un des grands " +"sites Web au lieu d'utiliser Tor. meek-amazon donne l'impression que vous " +"utilisez les services Web d'Amazon; meek-azure donne l'impression que vous " +"utilisez un site Web de Microsoft; et meek-google l'impression que vous " +"utilisez la recherche Google." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 13 Dec '16

13 Dec '16

commit 46405f0aab188e1e24c8dd55d45c09573a04ec94 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 13 22:18:20 2016 +0000 Update translations for tor-browser-manual --- fr/fr.po | 50 +++++++++++++++++++++++++++++++++++++++++++------- fr_CA/fr_CA.po | 47 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index fc7bf13..74eeb2b 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1314,36 +1314,41 @@ msgid "" "When both buttons are grey, you see the data that is visible to observers " "when you don't use either tool." msgstr "" +"Quand les deux boutons sont gris, vous voyez les données qui sont visibles " +"pour les observateurs quand vous n'utilisez aucun des deux outils." #: secure-connections.page:62 msgid "Potentially visible data" -msgstr "" +msgstr "Les données potentiellement visibles" #: secure-connections.page:70 msgid "The site being visited." -msgstr "" +msgstr "Le site que vous visitez." #: secure-connections.page:81 msgid "Username and password used for authentication." msgstr "" +"Le nom d'utilisateur et le mot de passe utilisés pour l'authentification." #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Les données qui sont transmises." #: secure-connections.page:103 msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" +"L'emplacement réseau de l'ordinateur utilisé pour visiter le site Web " +"(l'adresse IP publique)." #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Si Tor est utilisé ou non." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "" +msgstr "Configurer le navigateur Tor pour la sécurité et la facilité d'emploi" #: security-slider.page:10 msgid "Security Slider" @@ -1428,6 +1433,14 @@ msgid "" "disabled by default on all sites; most video and audio formats are disabled;" " and some fonts and icons may not display correctly." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript ; toutes les optimisations des performances JavaScript sont " +"désactivées ; certaines équations mathématiques pourraient ne pas s'afficher" +" correctement ; certaines fonctions de rendu des polices sont désactivées ; " +"certains types d'images sont désactivés ; JavaScript est désactivé par " +"défaut pour tous les sites ; la plupart des formats vidéo et audio sont " +"désactivés ; et certaines polices et icônes pourraient ne pas s'afficher " +"correctement." #: security-slider.page:53 msgid "Medium-High" @@ -1442,6 +1455,13 @@ msgid "" "disabled by default on all non-<link xref=\"secure-" "connections\">HTTPS</link> sites." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript ; toutes les optimisations des performances JavaScript sont " +"désactivées ; certaines équations mathématiques pourraient ne pas s'afficher" +" correctement ; certaines fonctions de rendu des polices sont désactivées ; " +"certains types d'images sont désactivés ; et JavaScript est désactivé par " +"défaut pour tous les sites <link xref=\"secure-connections\">non " +"HTTPS</link>." #: security-slider.page:64 msgid "Medium-Low" @@ -1454,6 +1474,11 @@ msgid "" "optimizations are disabled, causing some websites to run more slowly; and " "some mathematical equations may not display properly." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript ; certaines optimisations des performances <link " +"xref=\"plugins\">JavaScript</link> sont désactivées, ce qui entraîne un " +"fonctionnement plus lent de certains sites Web ; et certaines équations " +"mathématiques pourraient ne pas s'afficher correctement." #: security-slider.page:73 msgid "Low" @@ -1464,6 +1489,8 @@ msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"À ce niveau, toutes les fonctions du navigateur sont activées. C'est " +"l'option la plus facile d'emploi." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1480,26 +1507,35 @@ msgid "" "Provider or other authority is actively blocking connections to the Tor " "network." msgstr "" +"Les transports enfichables sont des outils que Tor peut utiliser pour " +"déguiser le trafic qu'il envoie. Cela peut être utile dans les cas où le " +"fournisseur d'accès à Internet ou une autre autorité bloque activement les " +"connexions vers le réseau Tor." #: transports.page:21 msgid "" "Currently there are six pluggable transports available, but more are being " "developed." msgstr "" +"Six transports enfichables sont proposés actuellement, mais d'autres sont en" +" cours de développement." #: transports.page:28 msgid "obfs3" -msgstr "" +msgstr "obfs3" #: transports.page:33 msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" +"obfs3 donne l'impression que le trafic Tor est aléatoire afin qu'il ne " +"ressemble pas à Tor ou à un autre protocole. Les ponts obfs3 fonctionneront " +"dans la plupart des endroits." #: transports.page:42 msgid "obfs4" -msgstr "" +msgstr "obfs4" #: transports.page:47 msgid "" diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 7d62882..8c6a908 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -1312,33 +1312,36 @@ msgstr "" #: secure-connections.page:62 msgid "Potentially visible data" -msgstr "" +msgstr "Les données potentiellement visibles" #: secure-connections.page:70 msgid "The site being visited." -msgstr "" +msgstr "Le site que vous visitez." #: secure-connections.page:81 msgid "Username and password used for authentication." msgstr "" +"Le nom d'utilisateur et le mot de passe utilisés pour l'authentification." #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Les données qui sont transmises." #: secure-connections.page:103 msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" +"L'emplacement réseau de l'ordinateur utilisé pour visiter le site Web " +"(l'adresse IP publique)." #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Si Tor est utilisé ou non." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "" +msgstr "Configurer le navigateur Tor pour la sécurité et la facilité d'emploi" #: security-slider.page:10 msgid "Security Slider" @@ -1423,6 +1426,13 @@ msgid "" "disabled by default on all sites; most video and audio formats are disabled;" " and some fonts and icons may not display correctly." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript; toutes les optimisations des performances JavaScript sont " +"désactivées; certaines équations mathématiques pourraient ne pas s'afficher " +"correctement; certaines fonctions de rendu des polices sont désactivées; " +"certains types d'images sont désactivés; JavaScript est désactivé par défaut" +" pour tous les sites; la plupart des formats vidéo et audio sont désactivés;" +" et certaines polices et icônes pourraient ne pas s'afficher correctement." #: security-slider.page:53 msgid "Medium-High" @@ -1437,6 +1447,13 @@ msgid "" "disabled by default on all non-<link xref=\"secure-" "connections\">HTTPS</link> sites." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript; toutes les optimisations des performances JavaScript sont " +"désactivées; certaines équations mathématiques pourraient ne pas s'afficher " +"correctement; certaines fonctions de rendu des polices sont désactivées; " +"certains types d'images sont désactivés; et JavaScript est désactivé par " +"défaut pour tous les sites <link xref=\"secure-connections\">non " +"HTTPS</link>." #: security-slider.page:64 msgid "Medium-Low" @@ -1449,6 +1466,11 @@ msgid "" "optimizations are disabled, causing some websites to run more slowly; and " "some mathematical equations may not display properly." msgstr "" +"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " +"avec NoScript ; certaines optimisations des performances <link " +"xref=\"plugins\">JavaScript</link> sont désactivées, ce qui entraîne un " +"fonctionnement plus lent de certains sites Web; et certaines équations " +"mathématiques pourraient ne pas s'afficher correctement." #: security-slider.page:73 msgid "Low" @@ -1459,6 +1481,8 @@ msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"À ce niveau, toutes les fonctions du navigateur sont activées. C'est " +"l'option la plus facile d'emploi." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1475,26 +1499,35 @@ msgid "" "Provider or other authority is actively blocking connections to the Tor " "network." msgstr "" +"Les transports enfichables sont des outils que Tor peut utiliser pour " +"déguiser le trafic qu'il envoie. Cela peut être utile dans les cas où le " +"fournisseur d'accès à Internet ou une autre autorité bloque activement les " +"connexions vers le réseau Tor." #: transports.page:21 msgid "" "Currently there are six pluggable transports available, but more are being " "developed." msgstr "" +"Six transports enfichables sont proposés actuellement, mais d'autres sont en" +" cours de développement." #: transports.page:28 msgid "obfs3" -msgstr "" +msgstr "obfs3" #: transports.page:33 msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" +"obfs3 donne l'impression que le trafic Tor est aléatoire afin qu'il ne " +"ressemble pas à Tor ou à un autre protocole. Les ponts obfs3 fonctionneront " +"dans la plupart des endroits." #: transports.page:42 msgid "obfs4" -msgstr "" +msgstr "obfs4" #: transports.page:47 msgid ""

1 0

[tor-messenger-build/master] Rebase patches for the 45.6.0 release
by arlo＠torproject.org 13 Dec '16

13 Dec '16

commit 8b5d8cedfb51e726842527f4a6fc01b37874c765 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Dec 13 14:00:03 2016 -0800 Rebase patches for the 45.6.0 release --- ChangeLog | 4 ++-- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- .../0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 2 +- projects/mozilla/config | 2 +- projects/tor-browser/config | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f3761a..3923b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ Tor Messenger 0.3.0b2 -- * All Platforms - * Use the tor-browser-45.5.1esr-6.0-1-build1 tag on tor-browser + * Use the tor-browser-45.6.0esr-6.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update ctypes-otr to f34a5848 - * Update tor-browser to 6.0.7 + * Update tor-browser to 6.0.8 * Don't allow javascript: links in themes * Permit storing cert. exceptions in private browsing mode * Bugzilla 1321420: Add a pref to disable JavaScript in browser requests diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 51b38dd..d4faed1 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From bd289165bfce9d0239d67571755cee1048e9433b Mon Sep 17 00:00:00 2001 +From d107a09da25db93e19b8512c29205de2aa0387c1 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index afd5a37..2f0ab05 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From a37fd7380b807ff8e4cebaef8a5817c670816091 Mon Sep 17 00:00:00 2001 +From 6c422054720f3ec350854c5560c36061b6146149 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/7] Trac 16475: Block flash too diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index 8a60703..faa24fa 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 39f09114b425a248516f27296a57b91978d47b81 Mon Sep 17 00:00:00 2001 +From f3465153bc87a2e9c57d0fe8e796d4a09bcc0e24 Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index f656910..1e7c83b 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From 074aeb6d15c5098991d0d7e652eddbf3b72f91d7 Mon Sep 17 00:00:00 2001 +From 0f7fcd0b4dba93f3e652838f9d9f988e9e8b8726 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index ce20f8e..2c24d45 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From a758107c5d793f0bfb686a5b60c70037b8ebf1bb Mon Sep 17 00:00:00 2001 +From 4c88cc660df421c77335f0d5fb73ea97430ed441 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/7] OSX: package as tar.bz2 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 6a8ad5a..54397a6 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 63d8e00c912bdbe1c336ecf4276e123d59c41be3 Mon Sep 17 00:00:00 2001 +From 803f92640e5a0856a5c78ccba5c4845144b88af3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/7] Updater fixups for TM diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index c976f0d..dce5f48 100644 --- a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From 943386570317551f9e2540e8a90ed7f5c8ce9b45 Mon Sep 17 00:00:00 2001 +From ef983cda8e98135413d12e8d7f4c3787db92670e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode diff --git a/projects/mozilla/config b/projects/mozilla/config index 6d5f826..e936de2 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-45.5.1esr-6.0-1-build1 +version: tor-browser-45.6.0esr-6.0-1-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index b1e035f..c0337b9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.0.7 +version: 6.0.8 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0