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

[translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
by translation＠torproject.org 16 May '16

16 May '16

commit 6793caf0d730b5e9925b8e7f7ea0b1ea11025934 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 16:46:41 2016 +0000 Update translations for tor-messenger-loggerproperties --- ja/logger.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/logger.properties b/ja/logger.properties index 2228c50..e26010a 100644 --- a/ja/logger.properties +++ b/ja/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is the filename of the log file. -badLogfile=Empty or corrupt log file: %S +badLogfile=このログファイルは空,もしくは破損しています : %S

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 May '16

16 May '16

commit a9350c4e8fde6a4db85f7c1a9bd578d2c22a256d Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 16:46:37 2016 +0000 Update translations for tor-messenger-otrproperties --- ja/otr.properties | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ja/otr.properties b/ja/otr.properties index 9ba9f54..44f026c 100644 --- a/ja/otr.properties +++ b/ja/otr.properties @@ -1,23 +1,23 @@ -msgevent.encryption_required_part1=You attempted to send an unencrypted message to %S. As a policy, unencrypted messages are not allowed. -msgevent.encryption_required_part2=Attempting to start a private conversation. Your message will be retransmitted when the private conversation starts. -msgevent.encryption_error=An error occurred when encrypting your message. The message was not sent. -msgevent.connection_ended=%S has already closed their private connection to you. Your message was not sent. Either end your private conversation, or restart it. -msgevent.setup_error=An error occured while setting up a private conversation with %S. -msgevent.msg_reflected=You are receiving your own OTR messages. You are either trying to talk to yourself, or someone is reflecting your messages back at you. -msgevent.msg_resent=The last message to %S was resent. -msgevent.rcvdmsg_not_private=The encrypted message received from %S is unreadable, as you are not currently communicating privately. -msgevent.rcvdmsg_unreadable=We received an unreadable encrypted message from %S. -msgevent.rcvdmsg_malformed=We received a malformed data message from %S. -msgevent.log_heartbeat_rcvd=Heartbeat received from %S. -msgevent.log_heartbeat_sent=Heartbeat sent to %S. +msgevent.encryption_required_part1=％S に非暗号化メッセージを送信しようとしました。非暗号化メッセージは許可されていません。 +msgevent.encryption_required_part2=プライベートな会話を開始しています。プライベートな会話が始まると、あなたのメッセージは再送信されます。 +msgevent.encryption_error=メッセージを暗号化中にエラーが発生しました。メッセージは送信されませんでした。 +msgevent.connection_ended=%S はあなたとのプライベートな会話を終了しています。メッセージは送信されませんでした。プライベートな会話を終了するか、あるいはもう一度開始してください。 +msgevent.setup_error=%S とのプライベートな会話を開始中にエラーが発生しました。 +msgevent.msg_reflected=あなたが送信した非公開メッセージが届きました。自分自身との会話を始めようとしたか、あるいは誰かがあなたのメッセージを送り返しました。 +msgevent.msg_resent=%S への最後のメッセージを再送信しました。 +msgevent.rcvdmsg_not_private=現在プライベートな会話を行っていないため、%S からの暗号化メッセージを解読できませんでした。 +msgevent.rcvdmsg_unreadable=%S からの解読できない暗号化メッセージを受信しました。 +msgevent.rcvdmsg_malformed=%S から不正な形式のデータを受信しました。 +msgevent.log_heartbeat_rcvd=%S からのハートビートを受信しました。 +msgevent.log_heartbeat_sent=％S にハートビートを送りました。 msgevent.rcvdmsg_general_err=An OTR error occured. -msgevent.rcvdmsg_unecrypted=The following message received from %S was not encrypted: %S -msgevent.rcvdmsg_unrecognized=We received an unrecognized OTR message from %S. -msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message. -context.gone_secure_private=Private conversation with %S started. -context.gone_secure_unverified=Private conversation with %S started. However, their identity has not been verified. -context.still_secure=Successfully refreshed the private conversation with %S. -error.enc=Error occurred encrypting message. +msgevent.rcvdmsg_unecrypted=%S からの以下のメッセージは暗号化されていません: %S +msgevent.rcvdmsg_unrecognized=%S からの認識できない非公開メッセージを受信しました。 +msgevent.rcvdmsg_for_other_instance=%S は別のセッションへのメッセージを送信しました。もし他のデバイスなどでログインしている場合、そちらでメッセージを受け取っているかもしれません。 +context.gone_secure_private=%S とのプライベートな会話を開始しました。 +context.gone_secure_unverified=%S とのプライベートな会話を開始しました。しかし、本人確認が取れていません。 +context.still_secure=%S とのプライベートな会話のリフレッシュに成功しました。 +error.enc=メッセージの暗号化中にエラーが発生しました。 error.not_priv=You sent encrypted data to %S, who wasn't expecting it. error.unreadable=You transmitted an unreadable encrypted message. error.malformed=You transmitted a malformed data message.

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 16 May '16

16 May '16

commit 749267f7145bb9ded09d9b78ec86cdde9d812dca Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 16:46:24 2016 +0000 Update translations for tor-messenger-conversationsproperties_completed --- ja/conversations.properties | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/ja/conversations.properties b/ja/conversations.properties new file mode 100644 index 0000000..06d898b --- /dev/null +++ b/ja/conversations.properties @@ -0,0 +1,80 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (targetChanged): +# %1$S is the new conversation title (display name of the new target), +# %2$S is the protocol name used for the new target. +targetChanged=この会話は %2$S を使用している %1$S と継続されます。 + +# LOCALIZATION NOTE (statusChanged): +# %1$S is the display name of the contact. +# %2$S is the new status type (a value from status.properties). +statusChanged=%1$S は現在 %2$S です。 +# LOCALIZATION NOTE (statusChangedWithStatusText): +# %1$S is the display name of the contact. +# %2$S is the new status type (a value from status.properties). +# %3$S is the status text (eg. "I'm currently away from the computer"). +statusChangedWithStatusText=%1$S は現在 %2$S: %3$S です。 +# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]): +# special case of the previous 2 strings for when the status was +# previously unknown. These 2 strings should not mislead the user +# into thinking the person's status has just changed. +statusChangedFromUnknown=%1$S は %2$S です。 +statusChangedFromUnknownWithStatusText=%1$S は %2$S: %3$S です。 +# LOCALIZATION NOTE (statusKnown[WithStatusText]): +# special case of the previous 2 strings for when an account has just +# been reconnected, so the status is now known. These 2 strings should not +# mislead the user into thinking the person's status has just changed. +statusKnown=あなたのアカウントは再接続されました。(%1$S は %2$S です) +statusKnownWithStatusText=あなたのアカウントは再接続されました。(%1$S は %2$S: %3$S です。) +# LOCALIZATION NOTE (statusUnknown): +# %S is the display name of the contact. +statusUnknown=あなたのアカウントは切断されました。(%S のステータスは不明です) + +accountDisconnected=あなたのアカウントは切断されました。 +accountReconnected=あなたのアカウントは再接続されました。 + +# LOCALIZATION NOTE (autoReply): +# %S is replaced by the text of a message that was sent as an automatic reply. +autoReply=自動返信 - %S + +# LOCALIZATION NOTE (noTopic): +# Displayed instead of the topic when no topic is set. +noTopic=この部屋にはトピックメッセージがありません。 + +# LOCALIZATION NOTE (topicSet): +# %1$S is the conversation name, %2$S is the topic. +topicSet=%1$S のトピック: %2$S +# LOCALIZATION NOTE (topicNotSet): +# %S is the conversation name. +topicNotSet=%S にはトピックがありません。 +# LOCALIZATION NOTE (topicChanged): +# %1$S is the user who changed the topic, %2$S is the new topic. +topicChanged=%1$S はトピックを変更しました: %2$S +# LOCALIZATION NOTE (topicCleared): +# %1$S is the user who cleared the topic. +topicCleared=%1$S はトピックを削除しました。 + +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S は現在 %2$S と名乗っています。 +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=あなたは現在％S と名乗っています。 + +# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): +# ellipsis is used when copying a part of a message to show that the message was cut +messenger.conversations.selections.ellipsis=[…] + +# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate): +# These 3 templates are used to format selected messages before copying them. +# Do not translate the texts between % characters, but feel free to adjust +# whitespace and separators to make them fit your locale. +messenger.conversations.selections.systemMessagesTemplate=%time% - %message% +messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message% +messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message%

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 16 May '16

16 May '16

commit 33587e7ebc283711baad0d02db7b2c25c26a9026 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 16:46:21 2016 +0000 Update translations for tor-messenger-conversationsproperties --- ja/conversations.properties | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ja/conversations.properties b/ja/conversations.properties index 1a5564a..06d898b 100644 --- a/ja/conversations.properties +++ b/ja/conversations.properties @@ -5,67 +5,67 @@ # LOCALIZATION NOTE (targetChanged): # %1$S is the new conversation title (display name of the new target), # %2$S is the protocol name used for the new target. -targetChanged=The conversation will continue with %1$S, using %2$S. +targetChanged=この会話は %2$S を使用している %1$S と継続されます。 # LOCALIZATION NOTE (statusChanged): # %1$S is the display name of the contact. # %2$S is the new status type (a value from status.properties). -statusChanged=%1$S is now %2$S. +statusChanged=%1$S は現在 %2$S です。 # LOCALIZATION NOTE (statusChangedWithStatusText): # %1$S is the display name of the contact. # %2$S is the new status type (a value from status.properties). # %3$S is the status text (eg. "I'm currently away from the computer"). -statusChangedWithStatusText=%1$S is now %2$S: %3$S. +statusChangedWithStatusText=%1$S は現在 %2$S: %3$S です。 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]): # special case of the previous 2 strings for when the status was # previously unknown. These 2 strings should not mislead the user # into thinking the person's status has just changed. -statusChangedFromUnknown=%1$S is %2$S. -statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S. +statusChangedFromUnknown=%1$S は %2$S です。 +statusChangedFromUnknownWithStatusText=%1$S は %2$S: %3$S です。 # LOCALIZATION NOTE (statusKnown[WithStatusText]): # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not # mislead the user into thinking the person's status has just changed. -statusKnown=Your account has been reconnected (%1$S is %2$S). -statusKnownWithStatusText=Your account has been reconnected (%1$S is %2$S: %3$S). +statusKnown=あなたのアカウントは再接続されました。(%1$S は %2$S です) +statusKnownWithStatusText=あなたのアカウントは再接続されました。(%1$S は %2$S: %3$S です。) # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. -statusUnknown=Your account is disconnected (the status of %S is no longer known). +statusUnknown=あなたのアカウントは切断されました。(%S のステータスは不明です) -accountDisconnected=Your account is disconnected. -accountReconnected=Your account has been reconnected. +accountDisconnected=あなたのアカウントは切断されました。 +accountReconnected=あなたのアカウントは再接続されました。 # LOCALIZATION NOTE (autoReply): # %S is replaced by the text of a message that was sent as an automatic reply. -autoReply=Auto-reply - %S +autoReply=自動返信 - %S # LOCALIZATION NOTE (noTopic): # Displayed instead of the topic when no topic is set. -noTopic=No topic message for this room. +noTopic=この部屋にはトピックメッセージがありません。 # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. -topicSet=The topic for %1$S is: %2$S. +topicSet=%1$S のトピック: %2$S # LOCALIZATION NOTE (topicNotSet): # %S is the conversation name. -topicNotSet=There is no topic for %S. +topicNotSet=%S にはトピックがありません。 # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S has changed the topic to: %2$S. +topicChanged=%1$S はトピックを変更しました: %2$S # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. -topicCleared=%1$S has cleared the topic. +topicCleared=%1$S はトピックを削除しました。 # LOCALIZATION NOTE (nickSet): # This is displayed as a system message when a participant changes his/her # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S は現在 %2$S と名乗っています。 # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=あなたは現在％S と名乗っています。 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

[torbirdy/master] Update privacy settings and related preferences
by sukhbir＠torproject.org 16 May '16

16 May '16

commit 2bdeffbbeedfdf382b33f0faaf6839427096544a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 12:26:34 2016 -0400 Update privacy settings and related preferences --- components/torbirdy.js | 161 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 111 insertions(+), 50 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 238c089..ba8195e 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -25,12 +25,7 @@ const kTorBirdyBranch = "extensions.torbirdy."; // preferences dialog. See `preferences.js'. const TorBirdyPrefs = { "extensions.torbirdy.protected": false, - // When the preferences below have been set, then only enable TorBirdy. - // Generate our own custom time-independent message-ID. - "mailnews.custom_message_id": true, - "mailnews.header.custom_message_id": "", - // Remove the date header. - "mailnews.local_date_header_generation": false, + // When the preferences below have been set, enable TorBirdy. /* Network @@ -38,6 +33,10 @@ const TorBirdyPrefs = { // Use a manual proxy configuration. "network.proxy.type": 1, + // https://bugs.torproject.org/10419 + "network.proxy.no_proxies_on": "", + // Restrict TBB ports. + "network.security.ports.banned": "9050,9051,9150,9151", // Number of seconds to wait before attempting to recontact an unresponsive proxy server. "network.proxy.failover_timeout": 1800, @@ -48,6 +47,8 @@ const TorBirdyPrefs = { // Set DNS proxying through SOCKS5. "network.proxy.socks_remote_dns": true, + // Disable DNS prefetching. + "network.dns.disablePrefetch": true, // https://lists.torproject.org/pipermail/tor-talk/2011-September/021398.html // "Towards a Tor-safe Mozilla Thunderbird" @@ -62,8 +63,15 @@ const TorBirdyPrefs = { // Likely privacy violations // https://blog.torproject.org/blog/experimental-defense-website-traffic-finge… - // https://trac.torproject.org/projects/tor/ticket/3914 + // https://bugs.torproject.org/3914 "network.http.pipelining": true, + "network.http.pipelining.aggressive": true, + "network.http.pipelining.maxrequests": 12, + "network.http.connection-retry-timeout": 0, + "network.http.max-persistent-connections-per-proxy": 256, + "network.http.pipelining.reschedule-timeout": 15000, + "network.http.pipelining.read-timeout": 60000, + // We do not fully understand the privacy issues of the SPDY protocol // We have no reason to believe that anyone would actually use it with // Thunderbird but we fail closed to keep users safe out of an abundance of @@ -74,8 +82,10 @@ const TorBirdyPrefs = { // author Mike Perry. "network.http.pipelining.ssl": true, "network.http.proxy.pipelining": true, - "network.http.pipelining.maxrequests": 12, - "network.http.sendRefererHeader": 0, + "network.http.sendRefererHeader": 2, + // https://bugs.torproject.org/16673 + "network.http.altsvc.enabled": false, + "network.http.altsvc.oe": false, // Disable proxy bypass issue. // Websockets have no use in Thunderbird over Tor; some versions of the @@ -87,6 +97,9 @@ const TorBirdyPrefs = { "network.websocket.enabled": false, // Cookies are allowed, but not third-party cookies. For Gmail and Twitter. "network.cookie.cookieBehavior": 1, + // http://kb.mozillazine.org/Network.cookie.lifetimePolicy + // 2: cookie expires at the end of the session. + "network.cookie.lifetimePolicy": 2, // Disable link prefetching. "network.prefetch-next": false, @@ -103,6 +116,7 @@ const TorBirdyPrefs = { // - OCSP servers may log information about a user as they use the internet // generally; it's everything we hate about CRLs and more "security.OCSP.enabled": 1, + "security.OCSP.GET.enabled": false, "security.OCSP.require": false, // Disable TLS Session Ticket. // See https://trac.torproject.org/projects/tor/ticket/4099 @@ -111,7 +125,9 @@ const TorBirdyPrefs = { // We do not want to enable a known weak protocol; users should use only use TLS "security.enable_ssl3": false, // Thunderbird 23.0 uses the following preference. + // https://bugs.torproject.org/11253 "security.tls.version.min": 1, + "security.tls.version.max": 3, // Display a dialog warning the user when entering an insecure site from a secure one. "security.warn_entering_weak": true, // Display a dialog warning the user when submtting a form to an insecure site. @@ -126,6 +142,8 @@ const TorBirdyPrefs = { // Disable 'extension blocklist' which might leak the OS information. // See https://trac.torproject.org/projects/tor/ticket/6734 "extensions.blocklist.enabled": false, + // Strict: certificate pinning is always enforced. + "security.cert_pinning.enforcement_level": 2, /* Mailnews @@ -196,6 +214,46 @@ const TorBirdyPrefs = { // Disable caching. "browser.cache.disk.enable": false, "browser.cache.memory.enable": false, + "browser.cache.offline.enable": false, + "browser.formfill.enable": false, + "signon.rememberSignons": false, + "signon.autofillForms": false, + + // https://bugs.torproject.org/10367 + "datareporting.healthreport.service.enabled": false, + "datareporting.healthreport.uploadEnabled": false, + "datareporting.policy.dataSubmissionEnabled": false, + "datareporting.healthreport.about.reportUrl": "data:text/plain,", + + // https://bugs.torproject.org/16256 + "browser.search.countryCode": "US", + "browser.search.region": "US", + "browser.search.geoip.url": "", + + // These have been copied from Tor Browser and don't apply to Thunderbird + // since the browser surface is limited (Gmail/Twitter) but we set them + // nevertheless. + // Disable client-side session and persistent storage. + "dom.storage.enabled": false, + // https://bugs.torproject.org/15758 + "device.sensors.enabled": false, + // https://bugs.torproject.org/5293 + "dom.battery.enabled": false, + // https://bugs.torproject.org/6204 + "dom.enable_performance": false, + // https://bugs.torproject.org/13023 + "dom.gamepad.enabled": false, + // https://bugs.torproject.org/8382 + "dom.indexedDB.enabled": false, + // https://bugs.torproject.org/13024 + "dom.enable_resource_timing": false, + // https://bugs.torproject.org/16336 + "dom.enable_user_timing": false, + // https://bugs.torproject.org/17046 + "dom.event.highrestimestamp.enabled": true, + + // https://bugs.torproject.org/11817 + "extensions.getAddons.cache.enabled": false, /* Enigmail @@ -230,6 +288,45 @@ const TorBirdyPrefs = { // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, + /* + Chat and Calendar + */ + + // Thunderbird 15 introduces the chat feature so disable the preferences below. + "purple.logging.log_chats": false, + "purple.logging.log_ims": false, + "purple.logging.log_system": false, + "purple.conversations.im.send_typing": false, + + // Messenger related preferences. + // Do not report idle. + "messenger.status.reportIdle": false, + "messenger.status.awayWhenIdle": false, + // Set the following preferences to empty strings. + "messenger.status.defaultIdleAwayMessage": "", + "messenger.status.userDisplayName": "", + // Do not connect automatically. + "messenger.startup.action": 0, + // Ignore invitations; do not automatically accept them. + "messenger.conversations.autoAcceptChatInvitations": 0, + // Do not format incoming messages. + "messenger.options.filterMode": 0, + // On copying the content in the chat window, remove the time information. + // See `comm-central/chat/locales/conversations.properties' for more information. + "messenger.conversations.selections.systemMessagesTemplate": "%message%", + "messenger.conversations.selections.contentMessagesTemplate": "%sender%: %message%", + "messenger.conversations.selections.actionMessagesTemplate": "%sender% %message%", + + // Mozilla Lightning. + "calendar.useragent.extra": "", + // We have to set a timezone otherwise the system time is used. "UTC" or + // "GMT" is not an option so we set it to Europe/London. + "calendar.timezone.local": "Europe/London", + + /* + Other Settings + */ + // RSS. "rss.display.prefer_plaintext": true, // These are similar to the mailnews.* settings. @@ -251,18 +348,10 @@ const TorBirdyPrefs = { // Disable JavaScript (email). "javascript.enabled": false, - // Disable client-side session and persistent storage. - "dom.storage.enabled": false, - // Do not run plugins out-of-process. - "dom.ipc.plugins.java.enabled": false, - // Disable changing of images via JavaScript. - "dom.disable_image_src_set": true, - // Disable WebM, WAV, Ogg, PeerConnection. - "media.webm.enabled": false, - "media.wave.enabled": false, - "media.ogg.enabled": false, + "media.navigator.enabled": false, "media.peerconnection.enabled": false, + "media.cache_size": 0, // Disable CSS :visited selector. "layout.css.visited_links_enabled": false, @@ -273,37 +362,9 @@ const TorBirdyPrefs = { // Disable remote images. "permissions.default.image": 2, - // Thunderbird 15 introduces the chat feature so disable the preferences below. - "purple.logging.log_chats": false, - "purple.logging.log_ims": false, - "purple.logging.log_system": false, - "purple.conversations.im.send_typing": false, - - // Messenger related preferences. - // Do not report idle. - "messenger.status.reportIdle": false, - "messenger.status.awayWhenIdle": false, - // Set the following preferences to empty strings. - "messenger.status.defaultIdleAwayMessage": "", - "messenger.status.userDisplayName": "", - // Do not connect automatically. - "messenger.startup.action": 0, - // Ignore invitations; do not automatically accept them. - "messenger.conversations.autoAcceptChatInvitations": 0, - // Do not format incoming messages. - "messenger.options.filterMode": 0, - // On copying the content in the chat window, remove the time information. - // See `comm-central/chat/locales/conversations.properties' for more information. - "messenger.conversations.selections.systemMessagesTemplate": "%message%", - "messenger.conversations.selections.contentMessagesTemplate": "%sender%: %message%", - "messenger.conversations.selections.actionMessagesTemplate": "%sender% %message%", - - // Mozilla Lightning. - "calendar.useragent.extra": "", - // We have to set a timezone otherwise the system time is used. "UTC" or - // "GMT" is not an option so we set it to Europe/London. - "calendar.timezone.local": "Europe/London", - + /* + Finish + */ // All preferences have been set: now enable TorBirdy. "extensions.torbirdy.protected": true, }

1 0

[tor/master] Fix memory leak in test_crypto_aes_ctr_testvec
by nickm＠torproject.org 16 May '16

16 May '16

commit 249f3a1664479879dc9096034901614302398841 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 09:55:09 2016 -0400 Fix memory leak in test_crypto_aes_ctr_testvec --- src/test/test_crypto.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index cba9158..5205945 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -548,6 +548,7 @@ test_crypto_aes_ctr_testvec(void *arg) done: tor_free(mem_op_hex_tmp); + crypto_cipher_free(c); } /** Run unit tests for our SHA-1 functionality */

1 0

[tor/master] Windows lacks truncate(3).
by nickm＠torproject.org 16 May '16

16 May '16

commit 9abd7b8f90c6803e28529aa41c6da9601d1c9d01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 09:25:19 2016 -0400 Windows lacks truncate(3). Fix the new crypto tests, which used truncate(3). --- configure.ac | 1 + src/test/test_crypto.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8eb57f8..de59c75 100644 --- a/configure.ac +++ b/configure.ac @@ -432,6 +432,7 @@ AC_CHECK_FUNCS( strtoull \ sysconf \ sysctl \ + truncate \ uname \ usleep \ vasprintf \ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index e981eac..cba9158 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1322,6 +1322,29 @@ test_crypto_pk_base64(void *arg) tor_free(encoded); } +#ifdef HAVE_TRUNCATE +#define do_truncate truncate +#else +static int +do_truncate(const char *fname, size_t len) +{ + struct stat st; + char *bytes; + + bytes = read_file_to_str(fname, RFTS_BIN, &st); + if (!bytes) + return -1; + /* This cast isn't so great, but it should be safe given the actual files + * and lengths we're using. */ + if (st.st_size < (off_t)len) + len = MIN(len, (size_t)st.st_size); + + int r = write_bytes_to_file(fname, bytes, len, 1); + tor_free(bytes); + return r; +} +#endif + /** Sanity check for crypto pk digests */ static void test_crypto_digests(void *arg) @@ -2664,8 +2687,8 @@ test_crypto_ed25519_storage(void *arg) tor_free(tag); /* whitebox test: truncated keys. */ - tt_int_op(0, ==, truncate(fname_1, 40)); - tt_int_op(0, ==, truncate(fname_2, 40)); + tt_int_op(0, ==, do_truncate(fname_1, 40)); + tt_int_op(0, ==, do_truncate(fname_2, 40)); tt_int_op(-1, OP_EQ, ed25519_pubkey_read_from_file(&pub, &tag, fname_2)); tt_ptr_op(tag, OP_EQ, NULL); tor_free(tag);

1 0

[tor/release-0.2.8] Improve comments in fallback update script
by nickm＠torproject.org 16 May '16

16 May '16

commit 46d813922ab891d934fca02d5511b7fbe18ebda8 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Apr 29 11:43:55 2016 +1000 Improve comments in fallback update script --- scripts/maint/updateFallbackDirs.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index d27c144..7e882a8 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,6 +1,13 @@ #!/usr/bin/python # Usage: scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc +# +# This script should be run from a stable, reliable network connection, +# with no other network activity (and not over tor). +# If this is not possible, please disable: +# PERFORM_IPV4_DIRPORT_CHECKS and PERFORM_IPV6_DIRPORT_CHECKS +# +# Needs dateutil (and potentially other python packages) # Needs stem available in your PYTHONPATH, or just ln -s ../stem/stem . # Optionally uses ipaddress (python 3 builtin) or py2-ipaddress (package) # for netblock analysis, in PYTHONPATH, or just @@ -1061,7 +1068,7 @@ class Candidate(object): downloader = DescriptorDownloader() start = datetime.datetime.utcnow() # some directory mirrors respond to requests in ways that hang python - # sockets, which is why we long this line here + # sockets, which is why we log this line here logging.info('Initiating consensus download from %s (%s:%d).', nickname, dirip, dirport) # there appears to be about 1 second of overhead when comparing stem's

1 0

[tor/release-0.2.8] Improve logging in fallback update script
by nickm＠torproject.org 16 May '16

16 May '16

commit d41f92b00655197463ed26c0854113ef5c1b6707 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Apr 29 11:45:13 2016 +1000 Improve logging in fallback update script Log a notice just before the script is about to perform a potentially time-consuming operation Clarify the warning when py2-ipaddress isn't found Make log levels more consistent No behavioural change (just logging) --- scripts/maint/updateFallbackDirs.py | 45 +++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 7e882a8..c003a1b 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -42,7 +42,7 @@ from stem.descriptor.remote import DescriptorDownloader import logging # INFO tells you why each relay was included or excluded -# WARN tells you about potential misconfigurations +# WARN tells you about potential misconfigurations and relay detail changes logging.basicConfig(level=logging.WARNING) logging.root.name = '' # INFO tells you about each consensus download attempt @@ -58,7 +58,9 @@ try: HAVE_IPADDRESS = True except ImportError: # if this happens, we avoid doing netblock analysis - logging.warning('Unable to import ipaddress, please install py2-ipaddress') + logging.warning('Unable to import ipaddress, please install py2-ipaddress.' + + ' A fallback list will be created, but optional netblock' + + ' analysis will not be performed.') ## Top-Level Configuration @@ -309,11 +311,11 @@ def write_to_file(str, file_name, max_len): with open(file_name, 'w') as f: f.write(str[0:max_len]) except EnvironmentError, error: - logging.warning('Writing file %s failed: %d: %s'% - (file_name, - error.errno, - error.strerror) - ) + logging.error('Writing file %s failed: %d: %s'% + (file_name, + error.errno, + error.strerror) + ) def read_from_file(file_name, max_len): try: @@ -679,8 +681,8 @@ class Candidate(object): this_ts = parse_ts(h['last']) if (len(h['values']) != h['count']): - logging.warn('Inconsistent value count in %s document for %s' - %(p, which)) + logging.warning('Inconsistent value count in %s document for %s' + %(p, which)) for v in reversed(h['values']): if (this_ts <= newest): agt1 = now - this_ts @@ -698,8 +700,8 @@ class Candidate(object): this_ts -= interval if (this_ts + interval != parse_ts(h['first'])): - logging.warn('Inconsistent time information in %s document for %s' - %(p, which)) + logging.warning('Inconsistent time information in %s document for %s' + %(p, which)) #print json.dumps(generic_history, sort_keys=True, # indent=4, separators=(',', ': ')) @@ -999,10 +1001,10 @@ class Candidate(object): if a.version != b.version: raise Exception('Mismatching IP versions in %s and %s'%(ip_a, ip_b)) if mask_bits > a.max_prefixlen: - logging.warning('Bad IP mask %d for %s and %s'%(mask_bits, ip_a, ip_b)) + logging.error('Bad IP mask %d for %s and %s'%(mask_bits, ip_a, ip_b)) mask_bits = a.max_prefixlen if mask_bits < 0: - logging.warning('Bad IP mask %d for %s and %s'%(mask_bits, ip_a, ip_b)) + logging.error('Bad IP mask %d for %s and %s'%(mask_bits, ip_a, ip_b)) mask_bits = 0 a_net = ipaddress.ip_network('%s/%d'%(ip_a, mask_bits), strict=False) return b in a_net @@ -1081,7 +1083,7 @@ class Candidate(object): retries = 0, fall_back_to_authority = False).run() except Exception, stem_error: - logging.debug('Unable to retrieve a consensus from %s: %s', nickname, + logging.info('Unable to retrieve a consensus from %s: %s', nickname, stem_error) status = 'error: "%s"' % (stem_error) level = logging.WARNING @@ -1384,7 +1386,7 @@ class CandidateList(dict): elif in_blacklist: # exclude excluded_count += 1 - logging.debug('Excluding %s: in blacklist.', f._fpr) + logging.info('Excluding %s: in blacklist.', f._fpr) else: if INCLUDE_UNLISTED_ENTRIES: # include @@ -1498,10 +1500,10 @@ class CandidateList(dict): if f.has_ipv6(): ip_list.append(f.ipv6addr) elif not CandidateList.allow(f.dirip, ip_list): - logging.debug('Eliminated %s: already have fallback on IPv4 %s'%( + logging.info('Eliminated %s: already have fallback on IPv4 %s'%( f._fpr, f.dirip)) elif f.has_ipv6() and not CandidateList.allow(f.ipv6addr, ip_list): - logging.debug('Eliminated %s: already have fallback on IPv6 %s'%( + logging.info('Eliminated %s: already have fallback on IPv6 %s'%( f._fpr, f.ipv6addr)) original_count = len(self.fallbacks) self.fallbacks = ip_limit_fallbacks @@ -1521,7 +1523,7 @@ class CandidateList(dict): contact_limit_fallbacks.append(f) contact_list.append(f._data['contact']) else: - logging.debug(('Eliminated %s: already have fallback on ' + + logging.info(('Eliminated %s: already have fallback on ' + 'ContactInfo %s')%(f._fpr, f._data['contact'])) original_count = len(self.fallbacks) self.fallbacks = contact_limit_fallbacks @@ -1544,7 +1546,7 @@ class CandidateList(dict): else: # technically, we already have a fallback with this fallback in its # effective family - logging.debug('Eliminated %s: already have fallback in effective ' + + logging.info('Eliminated %s: already have fallback in effective ' + 'family'%(f._fpr)) original_count = len(self.fallbacks) self.fallbacks = family_limit_fallbacks @@ -1884,6 +1886,8 @@ def list_fallbacks(): """ Fetches required onionoo documents and evaluates the fallback directory criteria for each of the relays """ + logging.warning('Downloading and parsing Onionoo data. ' + + 'This may take some time.') # find relays that could be fallbacks candidates = CandidateList() candidates.add_relays() @@ -1938,6 +1942,9 @@ def list_fallbacks(): # can serve a consensus, in favour of one that can't # but given it takes up to 15 seconds to check each consensus download, # the risk is worth it + if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS: + logging.warning('Checking consensus download speeds. ' + + 'This may take some time.') failed_count = candidates.perform_download_consensus_checks(max_count) # analyse and log interesting diversity metrics

1 0

[tor/release-0.2.8] Simplify string cleansing in fallback update script
by nickm＠torproject.org 16 May '16

16 May '16

commit ab06b79cba4b8eebec7afee680bc0f72a72aaf4a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Apr 29 11:47:13 2016 +1000 Simplify string cleansing in fallback update script No behavioural change --- scripts/maint/updateFallbackDirs.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index c003a1b..464d847 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -219,8 +219,7 @@ def cleanse_unprintable(raw_string): # Remove all unprintable characters cleansed_string = '' for c in raw_string: - if (c in string.ascii_letters or c in string.digits - or c in string.punctuation or c in string.whitespace): + if c in string.printable: cleansed_string += c return cleansed_string

1 0