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

2015-03-13 Thread translation
commit 50c2deb255493c3c46222cffd0374a0d93dd021f
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 17:45:38 2015 +

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

diff --git a/ca.po b/ca.po
index a9f0763..0c79e78 100644
--- a/ca.po
+++ b/ca.po
@@ -13,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2015-02-23 16:25+0100\n
-PO-Revision-Date: 2015-02-25 08:49+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-03-13 17:38+\n
+Last-Translator: laia_ laiaado...@gmail.com\n
 Language-Team: Catalan 
(http://www.transifex.com/projects/p/torproject/language/ca/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -60,7 +60,7 @@ msgstr Quan reinicieu el Tails, totes les dades de 
l'Electrum es perdran, incl
 
 #: config/chroot_local-includes/usr/local/bin/electrum:18
 msgid Do you want to start Electrum anyway?
-msgstr 
+msgstr Voleu iniciar l'Electrum de totes maneres?
 
 #: config/chroot_local-includes/usr/local/bin/electrum:20
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
@@ -367,7 +367,7 @@ msgid 
 a 
 
href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'Learn
  more.../a
-msgstr 
+msgstr a 
href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'Saber-ne
 més.../a
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:18
 msgid Tor is not ready

___
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

2015-03-13 Thread translation
commit dc2521322e659b75a7333ea59c74e2f4b9b65d61
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 17:45:54 2015 +

Update translations for torbutton-torbuttonproperties
---
 ca/torbutton.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ca/torbutton.properties b/ca/torbutton.properties
index 3d95c6e..4315e41 100644
--- a/ca/torbutton.properties
+++ b/ca/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Activar Tor
 torbutton.button.tooltip.enabled = Desactivar Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconeguda
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Lloc .onion
 torbutton.circuit_display.this_browser = Aquest navegador
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = Repetidor
 torbutton.circuit_display.tor_bridge = Pont
 torbutton.circuit_display.unknown_country = País desconegut
 torbutton.panel.tooltip.disabled = Feu clic per activar Tor

___
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

2015-03-13 Thread translation
commit c11f7e42766ffeae82a0d031f38e1d66a902e2a0
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 17:45:42 2015 +

Update translations for tails-misc_completed
---
 ca.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ca.po b/ca.po
index a1e2cf2..0c79e78 100644
--- a/ca.po
+++ b/ca.po
@@ -12,8 +12,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2015-02-11 22:08+0100\n
-PO-Revision-Date: 2015-02-23 11:31+\n
+POT-Creation-Date: 2015-02-23 16:25+0100\n
+PO-Revision-Date: 2015-03-13 17:38+\n
 Last-Translator: laia_ laiaado...@gmail.com\n
 Language-Team: Catalan 
(http://www.transifex.com/projects/p/torproject/language/ca/)\n
 MIME-Version: 1.0\n
@@ -59,8 +59,8 @@ msgid 
 msgstr Quan reinicieu el Tails, totes les dades de l'Electrum es perdran, 
inclòs el moneder de Bitcoins. És molt recomanable que només useu l'Electrum 
quan la seva propietat de persistència és activada. 
 
 #: config/chroot_local-includes/usr/local/bin/electrum:18
-msgid Do you want to start Electrum any way?
-msgstr Voleu iniciar l'Electrum igualment?
+msgid Do you want to start Electrum anyway?
+msgstr Voleu iniciar l'Electrum de totes maneres?
 
 #: config/chroot_local-includes/usr/local/bin/electrum:20
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
@@ -365,9 +365,9 @@ msgstr Tant el sistema operatiu instal·lat com el 
programari de virtualitzaci
 #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
 msgid 
 a 
-href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'Learn
+href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'Learn
  more.../a
-msgstr a 
href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'Apreneu-ne
 més.../a
+msgstr a 
href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'Saber-ne
 més.../a
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:18
 msgid Tor is not ready

___
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

2015-03-13 Thread translation
commit d4757ef7ee7cc315d32e91804f481c9f0f35aebf
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 19:15:45 2015 +

Update translations for torbutton-torbuttonproperties
---
 pt_BR/torbutton.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties
index 0ba8ab6..994810e 100644
--- a/pt_BR/torbutton.properties
+++ b/pt_BR/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Habilitar o Tor
 torbutton.button.tooltip.enabled = Desabilitar o Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconhecido
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Site Onion
 torbutton.circuit_display.this_browser = Esse navegador
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = retransmitir
 torbutton.circuit_display.tor_bridge = Ponte
 torbutton.circuit_display.unknown_country = País desconhecido
 torbutton.panel.tooltip.disabled = Clique para habilitar o Tor

___
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

2015-03-13 Thread translation
commit 353d5bf44d04bb5190b448c315a8287c149977b1
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 21:45:48 2015 +

Update translations for torbutton-torbuttonproperties
---
 sq/torbutton.properties |4 ++--
 sv/torbutton.properties |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sq/torbutton.properties b/sq/torbutton.properties
index e02d290..47ae211 100644
--- a/sq/torbutton.properties
+++ b/sq/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Aftësoni Tor
 torbutton.button.tooltip.enabled = Paaftësoni Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP e panjohur
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Webfaqe onion
 torbutton.circuit_display.this_browser = Ky shfletues
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = rele
 torbutton.circuit_display.tor_bridge = Urë
 torbutton.circuit_display.unknown_country = Vend i panjohur
 torbutton.panel.tooltip.disabled = Klikoni për të aftësuar Tor
diff --git a/sv/torbutton.properties b/sv/torbutton.properties
index 3e80e60..5ad3db8 100644
--- a/sv/torbutton.properties
+++ b/sv/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Aktivera Tor
 torbutton.button.tooltip.enabled = Inaktivera Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = Okänd IP-adress.
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Onion webbplats
 torbutton.circuit_display.this_browser = Denna webbläsare
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = relä
 torbutton.circuit_display.tor_bridge = Brygga
 torbutton.circuit_display.unknown_country = Okänt land
 torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor

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


[tor-commits] [webwml/staging] get rid of two more non-blocking-spaces

2015-03-13 Thread sebastian
commit 9ee47beb524f6cac50882d2edb2acd30a360bcf4
Author: Roger Dingledine a...@torproject.org
Date:   Wed Feb 18 18:23:49 2015 -0500

get rid of two more non-blocking-spaces
---
 projects/en/torbrowser.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 4f97dce..abccdee 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -82,7 +82,7 @@
 tr
   thbrLanguage/th
   thMicrosoft Windowsbrem(version-torbrowserbundle)/em/th
-  thMac OS Xbrem(version-torbrowserbundleosx32)/em/th
+  thMac OS Xbrem(version-torbrowserbundleosx32)/em/th
   thLinuxbrem(version-torbrowserbundlelinux32)/em/th
 /tr
   /thead
@@ -304,7 +304,7 @@
 tr
   thbrLanguage/th
   thMicrosoft 
Windowsbrem(version-torbrowserbundlebeta)/em/th
-  thMac OS Xbrem(version-torbrowserbundleosx64beta)/em/th
+  thMac OS Xbrem(version-torbrowserbundleosx64beta)/em/th
   thLinuxbrem(version-torbrowserbundlelinux32beta)/em/th
 /tr
   /thead



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


[tor-commits] [webwml/staging] Minor revisions for Juha's people page entry

2015-03-13 Thread sebastian
commit 74acfb457b5169499b014e10ab43f2618b1cd65f
Author: Damian Johnson ata...@torproject.org
Date:   Thu Feb 12 08:07:25 2015 -0800

Minor revisions for Juha's people page entry

Misspelling and mentioning that he's a researcher.
---
 about/en/volunteers.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/volunteers.wml b/about/en/volunteers.wml
index 2e96e10..9561c47 100644
--- a/about/en/volunteers.wml
+++ b/about/en/volunteers.wml
@@ -24,7 +24,7 @@ question about Tor./dd
 technology./dd
 dtFabian Keil/dtddOne of the core Privoxy developers, and also a
 Tor fan. He's the reason Tor and Privoxy still work well together./dd
-dtJuha Nurmi/dtddGSoC sudent in 2014 and author behind a
+dtJuha Nurmi/dtddGSoC student in 2014 and researcher behind a
 href=https://blog.torproject.org/category/tags/ahmiafi;Ahmia/a, a search
 engine for hidden services./dd
 dtJulius Mittenzwei/dtddA lawyer with the CCC in



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


[tor-commits] [webwml/staging] Bump dev version on website to 0.2.6.3-alpha

2015-03-13 Thread sebastian
commit ef8833d744bacecd8397c0bd120d10cfbc9b1f67
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Feb 19 17:18:26 2015 -0500

Bump dev version on website to 0.2.6.3-alpha
---
 Makefile |2 +-
 include/versions.wmi |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d8dda85..7cc2fda 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.5.10
-export DEVTAG=tor-0.2.6.2-alpha
+export DEVTAG=tor-0.2.6.3-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 2c0d6ee..6d02728 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 define-tag version-stable whitespace=delete0.2.5.10/define-tag
-define-tag version-alpha whitespace=delete0.2.6.2-alpha/define-tag
+define-tag version-alpha whitespace=delete0.2.6.3-alpha/define-tag
 
 define-tag version-win32-stable whitespace=delete0.2.5.10/define-tag
 define-tag version-win32-alpha whitespace=delete0.2.5.10/define-tag



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


[tor-commits] [webwml/staging] update the end date of the rfa sponsorship

2015-03-13 Thread sebastian
commit fa1845b7ef777c1fe4be92da216e85d9b17e75dc
Author: Roger Dingledine a...@torproject.org
Date:   Sat Feb 21 04:48:21 2015 -0500

update the end date of the rfa sponsorship
---
 about/en/sponsors.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index b0c268a..45d4bbb 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -25,7 +25,7 @@
 
 h3Active Sponsors in 2015:/h3
   ul
- lia href=http://www.rfa.org/english/;Radio Free Asia/a 
(2012-2014)/li
+ lia href=http://www.rfa.org/english/;Radio Free Asia/a 
(2012-2016)/li
  lia href=http://nsf.gov/;National Science Foundation/a joint 
with Georgia Tech and Princeton University (2012-2016)/li
  lia href=http://nsf.gov/;National Science Foundation/a via 
University of Minnesota (2013-2017)/li
  lia href=https://digitaldefenders.org/;Hivos/The Digital 
Defenders Partnership/a (2014-2015)/li



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


[tor-commits] [webwml/master] Reword first paragraph on tor overview

2015-03-13 Thread sebastian
commit b11d531d31a247025309ff88bcd48ed2c2ce1511
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 03:26:58 2015 +0100

Reword first paragraph on tor overview
---
 about/en/overview.wml |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/about/en/overview.wml b/about/en/overview.wml
index aa3cb56..c275f9f 100644
--- a/about/en/overview.wml
+++ b/about/en/overview.wml
@@ -29,13 +29,17 @@
 h3a class=anchor href=#overviewOverview/a/h3
 
 p
-Tor is a network of virtual tunnels that allows people and groups to
-improve their privacy and security on the Internet.  It also enables
-software developers to create new communication tools
-with built-in privacy features.  Tor provides the foundation for
-a range of applications that allow organizations and individuals
-to share information over public networks without compromising their
-privacy.
+The Tor network is a group of a href=page
+getinvolved/volunteervolunteer/a-operated servers that allows people
+to improve their privacy and security on the Internet. Tor's users employ
+this network by connecting through a series of virtual tunnels rather than
+making a direct connection, thus allowing both organizations and
+individuals to share information over public networks without compromising
+their privacy. Along the same line, Tor is an effective censorship
+circumvention tool, allowing its users to reach otherwise blocked
+destinations or content.  Tor can also be used as a building block for
+software developers to create new communication tools with built-in privacy
+features.
 /p
 
 p

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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2015-03-13 Thread translation
commit 8efc550e8feb2f4e90997a1e3ce9a5b24d7174c0
Author: Translation commit bot translat...@torproject.org
Date:   Sat Mar 14 05:15:34 2015 +

Update translations for tor-launcher-network-settings
---
 zh_CN/network-settings.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 29a5f00..4e6d5e1 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -9,15 +9,15 @@
 
 !ENTITY torSettings.firstQuestion 以下哪个描述与你的情
况最为匹配?
 !ENTITY torSettings.configurePrompt1 
网络连接受到审查或需要代理。
-!ENTITY torSettings.configurePrompt2 我需要添加
网桥或对本地代理进行配置。
+!ENTITY torSettings.configurePrompt2 需要添加
网桥或对本地代理进行配置。
 !ENTITY torSettings.configure 配置
 !ENTITY torSettings.connectPrompt2 我想要直接连接 Tor 网络。
 !ENTITY torSettings.connectPrompt3 通常这种方式是有效的。
 !ENTITY torSettings.connect 连接
 
-!ENTITY torSettings.proxyQuestion 
请问这台计算机需要使用一个本地代理来访问互联网吗?
+!ENTITY torSettings.proxyQuestion 
是否需要本地代理访问互联网?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp 
如果您不知道如何回答这个问题,看看其他浏览器中的 
Internet 设置,看它是否有配置为使用一个本地代理。
+!ENTITY torSettings.proxyHelp 
如果不知道如何回答该问题,请检查å…
¶ä»–浏览器中的互联网设置,查看是否使用本地代理。
 !ENTITY torSettings.enterProxy 输入代理设置。
 !ENTITY torSettings.bridgeQuestion 互联网服务提供商  (ISP)  
是否对 Tor 网络连接进行了封锁或审查?
 !ENTITY torSettings.bridgeHelp 
如果不理解该问题,请选择“否”。如果选择“是”,那么需要对
 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非å…
¬å¼€ç½‘络中继,更难于封锁。
@@ -30,7 +30,7 @@
 
 !ENTITY torsettings.optional 可选
 
-!ENTITY torsettings.useProxy.checkbox 
这台计算机需要使用一个本地代理来访问互联网
+!ENTITY torsettings.useProxy.checkbox 需要本地代理来访问互联网
 !ENTITY torsettings.useProxy.type 代理类型:
 !ENTITY torsettings.useProxy.address 地址:
 !ENTITY torsettings.useProxy.address.placeholder IP 地址或主机名

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


[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2015-03-13 Thread translation
commit cfd682553dd5800c26ccbb9b80e39f3c983a34cc
Author: Translation commit bot translat...@torproject.org
Date:   Sat Mar 14 05:15:39 2015 +

Update translations for tor-launcher-network-settings_completed
---
 zh_CN/network-settings.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 29a5f00..4e6d5e1 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -9,15 +9,15 @@
 
 !ENTITY torSettings.firstQuestion 以下哪个描述与你的情
况最为匹配?
 !ENTITY torSettings.configurePrompt1 
网络连接受到审查或需要代理。
-!ENTITY torSettings.configurePrompt2 我需要添加
网桥或对本地代理进行配置。
+!ENTITY torSettings.configurePrompt2 需要添加
网桥或对本地代理进行配置。
 !ENTITY torSettings.configure 配置
 !ENTITY torSettings.connectPrompt2 我想要直接连接 Tor 网络。
 !ENTITY torSettings.connectPrompt3 通常这种方式是有效的。
 !ENTITY torSettings.connect 连接
 
-!ENTITY torSettings.proxyQuestion 
请问这台计算机需要使用一个本地代理来访问互联网吗?
+!ENTITY torSettings.proxyQuestion 
是否需要本地代理访问互联网?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp 
如果您不知道如何回答这个问题,看看其他浏览器中的 
Internet 设置,看它是否有配置为使用一个本地代理。
+!ENTITY torSettings.proxyHelp 
如果不知道如何回答该问题,请检查å…
¶ä»–浏览器中的互联网设置,查看是否使用本地代理。
 !ENTITY torSettings.enterProxy 输入代理设置。
 !ENTITY torSettings.bridgeQuestion 互联网服务提供商  (ISP)  
是否对 Tor 网络连接进行了封锁或审查?
 !ENTITY torSettings.bridgeHelp 
如果不理解该问题,请选择“否”。如果选择“是”,那么需要对
 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非å…
¬å¼€ç½‘络中继,更难于封锁。
@@ -30,7 +30,7 @@
 
 !ENTITY torsettings.optional 可选
 
-!ENTITY torsettings.useProxy.checkbox 
这台计算机需要使用一个本地代理来访问互联网
+!ENTITY torsettings.useProxy.checkbox 需要本地代理来访问互联网
 !ENTITY torsettings.useProxy.type 代理类型:
 !ENTITY torsettings.useProxy.address 地址:
 !ENTITY torsettings.useProxy.address.placeholder IP 地址或主机名

___
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

2015-03-13 Thread translation
commit 6bbd45924013a003b8386bfe123b0cf6f9dbf0c3
Author: Translation commit bot translat...@torproject.org
Date:   Sat Mar 14 05:15:53 2015 +

Update translations for torbutton-torbuttonproperties
---
 zh_CN/torbutton.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index 3c84582..5614cee 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -2,7 +2,7 @@ torbutton.button.tooltip.disabled = 启用 Tor
 torbutton.button.tooltip.enabled = 禁用 Tor
 torbutton.circuit_display.internet = 互联网
 torbutton.circuit_display.ip_unknown = IP 未知
-torbutton.circuit_display.onion_site = 洋葱网站
+torbutton.circuit_display.onion_site = onion 站点
 torbutton.circuit_display.this_browser = 本浏览器
 torbutton.circuit_display.relay = 中继
 torbutton.circuit_display.tor_bridge = 网桥
@@ -34,7 +34,7 @@ torbutton.popup.external.note = 
部分文件类型可能会导致应用程序在
 torbutton.popup.external.suggest = 为了安å…
¨èµ·è§ï¼Œæ‚¨åº”该只在离线状态下打开下载的文件,或者使用 
Tor Live CD,例如 Tails。\n
 torbutton.popup.launch = 下载文件
 torbutton.popup.cancel = 取消
-torbutton.popup.dontask = 自动下载文件于
+torbutton.popup.dontask = 以后自动下载文件
 torbutton.popup.test.no_http_proxy = Tor 代理测试:本地 HTTP 
代理不可达,您的 Polipo 正常启动了吗?
 torbutton.popup.captcha.title = 避免 Google Captcha?
 torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google 
Captcha,您是否愿意把本次搜索重定向到使用其他搜索引擎?

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


[tor-commits] [webwml/master] Remove hidden services paragraph from overview page

2015-03-13 Thread sebastian
commit cea337eba86a4ee272786c91bf7b26e9cd7080c6
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 03:11:33 2015 +0100

Remove hidden services paragraph from overview page

we already have that content on the hidden service page, and we link to
it from this page already
---
 about/en/overview.wml |   19 ---
 1 file changed, 19 deletions(-)

diff --git a/about/en/overview.wml b/about/en/overview.wml
index ceca1d7..aa3cb56 100644
--- a/about/en/overview.wml
+++ b/about/en/overview.wml
@@ -17,7 +17,6 @@
 lia href=page about/overview#overviewOverview/a/li
 lia href=page about/overview#whyweneedtorWhy we need 
Tor/a/li
 lia href=page about/overview#thesolutionThe Solution/a/li
-lia href=page about/overview#hiddenservicesHidden 
services/a/li
 lia href=page about/overview#stayinganonymousStaying 
anonymous/a/li
 lia href=page about/overview#thefutureoftorThe future of 
Tor/a/li
   /ul
@@ -182,24 +181,6 @@
 
 pimg alt=Tor circuit step three src=$(IMGROOT)/htw3.png/p
 
-
-a name=hiddenservices/a
-h3a class=anchor href=#hiddenservicesHidden services/a/h3
-
-p
-Tor also makes it possible for users to hide their locations while
-offering various kinds of services, such as web publishing or an instant
-messaging server.  Using Tor rendezvous points, other Tor users can
-connect to these hidden services, each without knowing the other's
-network identity.  This hidden service functionality could allow Tor
-users to set up a website where people publish material without worrying
-about censorship.  Nobody would be able to determine who was offering
-the site, and nobody who offered the site would know who was posting to it.
-Learn more about a href=page docs/tor-hidden-serviceconfiguring
-hidden services/a and how the a href=page 
docs/hidden-serviceshidden
-service protocol/a works.
-/p
-
 a name=stayinganonymous/a
 h3a class=anchor href=#stayinganonymousStaying anonymous/a/h3
 

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


[tor-commits] [webwml/master] Remove duplicated inception paragraph from about tor

2015-03-13 Thread sebastian
commit fa83be0a956cc9437c6f50c99d38e0e85305777f
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 03:05:34 2015 +0100

Remove duplicated inception paragraph from about tor
---
 about/en/overview.wml |   14 --
 1 file changed, 14 deletions(-)

diff --git a/about/en/overview.wml b/about/en/overview.wml
index ee9a348..ceca1d7 100644
--- a/about/en/overview.wml
+++ b/about/en/overview.wml
@@ -14,7 +14,6 @@
 div class=sidebar-left
   h3Topics/h3
   ul
-lia href=page about/overview#inceptionInception/a/li
 lia href=page about/overview#overviewOverview/a/li
 lia href=page about/overview#whyweneedtorWhy we need 
Tor/a/li
 lia href=page about/overview#thesolutionThe Solution/a/li
@@ -27,19 +26,6 @@
 
 hr
 
-a name=inception/a
-h3a class=anchor href=#inceptionInception/a/h3
-
-p
-Tor was originally designed, implemented, and deployed as a
-third-generation a href=http://www.onion-router.net/;onion routing
-project of the U.S. Naval Research Laboratory/a.  It was originally
-developed with the U.S. Navy in mind, for the primary purpose of
-protecting government communications.  Today, it is used every day
-for a wide variety of purposes by normal people, the military,
-journalists, law enforcement officers, activists, and many
-others. /p
-
 a name=overview/a
 h3a class=anchor href=#overviewOverview/a/h3
 

___
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

2015-03-13 Thread translation
commit f8a5a8e2993cb6e9ce3a4fd45997e1140dc4be17
Author: Translation commit bot translat...@torproject.org
Date:   Sat Mar 14 05:45:46 2015 +

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

diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index 5614cee..5fdf813 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -13,7 +13,7 @@ torbutton.panel.plugins.disabled = 点击启用插件
 torbutton.panel.plugins.enabled = 点击禁用插件
 torbutton.panel.label.disabled = Tor 已禁用
 torbutton.panel.label.enabled = Tor 已启用
-extensions.torbut...@torproject.org.description = Torbutton 是一个可以é…
ç½®Tor并能简单快速清理个人浏览数据的按钮。
+extensions.torbut...@torproject.org.description = Torbutton 
是一个按钮,可对“Tor 
设置”进行修改,并可快速而方便地清除浏览器隐私数据。
 torbutton.popup.history.warning = Torbutton 屏蔽了在其他 Tor 状态下加
载的标签的活动。\n\n这是用于暂时解决 Firefox Bug 409737 和 
417869。\n如果这个弹出窗口在您不知情的情
况下弹出,则您的标签之一正试图在后台重新载å…
¥è‡ªå·±ï¼Œç„¶è€Œè¿™æ ·çš„行为是被屏蔽的。\n\n要刷新当前 Tor 
状态下的标签,将焦点置于在地址栏并按回车键。\n\n
 torbutton.popup.plugin.warning = Torbutton 阻止了浏览器戴 Tor 
时直接加载需要插件支持的内
容。\n\n请使用“另存为”(保存后浏览)。\n\n
 torbutton.popup.confirm_ca_certs = Torbutton 
注意:浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作,障碍Tor的切换。您是否希望禁用对CA证书的隔离?)如果您不懂,可以选择“确定”)

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


[tor-commits] [webwml/staging] Make this table even

2015-03-13 Thread sebastian
commit 19547e39e8cf567cb15ec308281bb4b09beec283
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:20:03 2015 +0100

Make this table even
---
 about/en/board.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 0db1ccd..040e751 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -13,7 +13,7 @@
 h1Board of Directors/h1
 table
   tr
-td
+td style=width:50%;
   div class=nameCaspar Bowden/div
   div class=capsDirector/div
   p
@@ -24,7 +24,7 @@
 management, and information ethics and philosophy.
   /p
 /td
-td class=beige
+td class=beige style=width:50%;
   div class=nameNick Mathewson/div
   div class=capsVice-President and Director/div
   p

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


[tor-commits] [webwml/staging] fix my contact info

2015-03-13 Thread sebastian
commit d3b0ad1b62ca511213af17f44835976c8872216a
Author: Andrew Lewman and...@torproject.is
Date:   Sun Feb 15 20:23:24 2015 -0500

fix my contact info
---
 about/en/corepeople.wml |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index af84ffe..d914c23 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -1,4 +1,4 @@
-## translation metadata
+## translation metadata
 # Revision: $Revision$
 # Translation-Priority: 3-low
 #include head.wmi TITLE=Tor Project: Core People CHARSET=UTF-8
@@ -220,14 +220,11 @@
   a href=http://www.subgraph.com/orchid.html;Orchid/a,
   a Tor client in Java./dd
 
-  dtAndrew Lewman, Executive Director, Director,
-  a href=page press/presspress contact/a/dt
+  dtAndrew Lewman, Executive Director, Secretary and Treasurer of 
the Board/dt
   ddManages the business operations of The Tor Project, Inc.
   Plays roles of finance, advocacy, project management, strategy,
   press, law enforcement liason, and victim of domestic violence
-  advocate. He can be contacted via OpenPGP 0x6B4D6475, a
-  href=http://ostel.co/;Ostel/a via ostel-lew...@ostel.co,
-  or +1-781-948-1982./dd
+  advocate. He can be contacted via and...@torproject.is or 
+1-781-948-1982./dd
 
   dtDr. Karsten Loesing, Metrics Researcher and Developer/dt
   ddPrimary researcher and developer into



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


[tor-commits] [webwml/staging] Dropping the panopticlick project from the volunteer page

2015-03-13 Thread sebastian
commit 5c39e14c7719cfc3506a297d5422c6972aa77f88
Author: Damian Johnson ata...@torproject.org
Date:   Sun Feb 15 13:13:14 2015 -0800

Dropping the panopticlick project from the volunteer page

Tried to get ahold of Georg to see if he's interested in mentoring this but 
no
luck, so dropping the project.
---
 getinvolved/en/volunteer.wml |   63 --
 1 file changed, 63 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 0a1dd52..2b8362f 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -422,11 +422,6 @@ meetings around the world./li
 privacy and security issues in mainline version.
 /p
 
-p
-bProject Ideas:/bbr /
-ia href=#panopticlickPanopticlick/a/ibr /
-/p
-
 a id=project-httpseverywhere/a
 h3a href=https://www.eff.org/https-everywhere;HTTPS Everywhere/a (a
 href=https://gitweb.torproject.org/https-everywhere.git;code/a, a
@@ -1432,64 +1427,6 @@ the codebase that you want to work on.
 /p
 /li
 
-a id=panopticlick/a
-li
-bPanopticlick/b
-br
-Effort Level: iMedium/i
-br
-Skill Level: iMedium/i
-br
-Likely Mentors: iGeorg (GeKo)/i
-p
-
-The a href=https://panopticlick.eff.org;Panopticlick project by the EFF/a
-revolutionized how people think about a
-href=https://panopticlick.eff.org/browser-uniqueness.pdf;browser
-fingerprinting/a, both by developing tests and metrics to measure browser
-fingerprintability, and by crowdsourcing the evaluation and contribution of
-individual browser features to overall fingerprintability.
-
-/p
-p
-
-Unfortunately, the way Panopticlick is designed a
-href=https://blog.torproject.org/blog/effs-panopticlick-and-torbutton;makes
-it difficult/a to evaluate defenses to browser fingerprinting, especially
-for browsers with a relatively small userbase such as Tor Browser. This is
-because any approach we take to reduce fingerprinting automatically makes our
-users more distinct from the previous users who submitted their fingerprint
-data to the EFF. Indeed, it is also impossible to ever expect that users of
-one browser will ever be able to blend in with users of another browser
-(Chrome users will always be distinguishable from Firefox users for example,
-based on feature set alone).
-
-   /p
-   p
-
-To address this, we would like to have a
-href=https://trac.torproject.org/projects/tor/ticket/6119;our own
-fingerprint test suite/a to evaluate the fingerprintability of each browser
-feature for users running a specific Tor Browser version. There are also a
-href=https://trac.torproject.org/projects/tor/query?keywords=~tbb-fingerprinting;additional
-fingerprinting tests/a we can add beyond those deployed by Panopticlick.
-   /p
-   p
-
-For this project, the student would develop a website that users can
-voluntarily visit to test and record their Tor Browser fingerprint.  The user
-should get feedback on how she performed and the test results should be
-available in a machine readable format (e.g. JSON), broken down by Tor Browser
-version.  In a second step one could think about adding more sophisticated
-tests or supporting other browser vendors that might want to test the
-uniformity amongst their userbase as well. Of course, results from each
-browser would also need to be broken down by both browser implementation and
-version, so that results would only reflect the population of that specific
-implementation.
-
-/p
-/li
-
 a id=ahmiaSearch/a
 li
 bAhmia - Hidden Service Search/b



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


[tor-commits] [webwml/staging] torrc is in a new location in TB.

2015-03-13 Thread sebastian
commit e0037ef0ee6e86ea0aad323b159a9cbcc381a094
Author: Roger Dingledine a...@torproject.org
Date:   Tue Feb 17 00:52:18 2015 -0500

torrc is in a new location in TB.

can somebody check if the sentence after this, about how to find
directories on osx, is still true?
---
 docs/en/faq.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index 3883def..9d47a75 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1634,7 +1634,8 @@ configuration should work fine for most Tor users.
 /p
 p
 If you installed Tor Browser, look for
-codeData/Tor/torrc/code inside your Tor Browser directory.
+codeBrowser/TorBrowser/Data/Tor/torrc/code inside your Tor Browser
+directory.
 On OS X, you must right-click or command-click on the Tor Browser icon,
 and select Show Package Contents before the Tor Browser directories become
 visible.



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


[tor-commits] [webwml/staging] Add Julius to board page, reformat

2015-03-13 Thread sebastian
commit 351487b838f440dd09df07d57da2a5a77a56873f
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:09:56 2015 +0100

Add Julius to board page, reformat
---
 about/en/board.wml |  122 ++--
 1 file changed, 81 insertions(+), 41 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index df00fd2..c4da922 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -13,59 +13,99 @@
 h1Board of Directors/h1
 table
   tr
+td
+  div class=nameCaspar Bowden/div
+  div class=capsDirector/div
+  p
+An independent advocate for information self-determination
+rights, and public understanding of privacy research in
+computer science. He is a specialist in data protection
+policy, EU and US surveillance law, PET research, identity
+management, and information ethics and philosophy.
+  /p
+/td
 td class=beige
-div class=nameRoger Dingledine/div
-div class=capsPresident and Director/div
-  pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
-  /td
-  td
-  div class=nameMeredith Hoban-Dunn/div
-div class=capsAudit Committee Chair/div
-   pMeredith is an accomplished accountant, advisor, and banker.  
Her role is to help us make sure we're able to pass our corporate audits 
correctly, watch for internal fraud, tell us when we're doing things in a 
non-standard way, and so on./p
+  div class=nameNick Mathewson/div
+  div class=capsVice-President and Director/div
+  p
+Nick is one of the original developers of Tor.  He's the
+Chief Architect of The Tor Project, Inc.
+  /p
+/td
+  /tr
+  tr
+td class=beige
+  div class=nameRoger Dingledine/div
+  div class=capsPresident and Director/div
+  p
+Original developer of Tor along with Nick Mathewson and Paul
+Syverson. Leading researcher in the anonymous communications
+field.  Frequent speaker at conferences to advocate Tor and
+explain what Tor is and can do. Helps coordinate academic
+researchers.
+  /p
+/td
+td
+  div class=nameJulius Mittenzwei/div
+  div class=capsDirector/div
+  p
+Germany-based lawyer and Internet activist.
+  /p
 /td
   /tr
   tr
 td
   div class=nameIan Goldberg/div
-div class=capsChairman of the Board/div
-  pCryptographer, privacy expert, and professor; one of the 
designers of a href=http://www.cypherpunks.ca/otr/;Off-the-Record 
Messaging/a./p
+  div class=capsChairman of the Board/div
+  p
+Cryptographer, privacy expert, and professor; one of the
+designers of a
+href=http://www.cypherpunks.ca/otr/;Off-the-Record
+Messaging/a.
+  /p
 /td
-  td class=beige
-div class=nameAndrew Lewman/div
-div class=capsSecretary, Treasurer, and Executive Director/div
-pAndrew is the Executive Director responsible for all
-operations of The Tor Project, Inc.  His other activities
-can be found at a href=http://lewman.is;his website/a./p
-  /td
-/tr
-tr
-  td class=beige
-div class=nameNick Mathewson/div
-div class=capsVice-President and Director/div
-pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
-   /td
-   td
-div class=nameRabbi Rob Thomas/div
-div class=capsDirector/div
-  pRob is CEO and founder of Team Cymru, and a
-  Cymru Fellow. You can learn more about Rob at the a
-  href=http://www.team-cymru.org/;Team Cymru/a websites./p
+td class=beige
+  div class=nameWendy Seltzer/div
+  div class=capsDirector/div
+  p
+Lawyer, cyberlaw professor, and founder of a
+href=http://chillingeffects.org/;ChillingEffects.org/a.
+  /p
 /td
   /tr
   tr
-  td
-  div class=nameCaspar Bowden/div
-div class=capsDirector/div
-   pAn independent advocate for information self-determination
-   rights, and public understanding of privacy research in
-   computer science. He is a specialist in data protection policy,
-   EU and US surveillance law, PET research, identity management,
-   and information ethics and philosophy./p
+td class=beige
+  div class=nameMeredith Hoban-Dunn/div
+  div class=capsAudit Committee Chair/div
+  p
+Meredith is an accomplished accountant, advisor, and
+   

[tor-commits] [webwml/staging] Bug 13407: Update signature verification

2015-03-13 Thread sebastian
commit 072eeada5b3af0d9c789c5aa53f4ce7530ae093d
Author: Georg Koppen g...@torproject.org
Date:   Tue Feb 24 12:50:53 2015 +

Bug 13407: Update signature verification
---
 docs/en/verifying-signatures.wml |   56 ++
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index af3e437..a489703 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -53,8 +53,8 @@
 package and the extension .asc. These .asc files are GPG
 signatures. They allow you to verify the file you've downloaded
 is exactly the one that we intended you to get. For example,
-tor-browser-2.3.25-13_en-US.exe is accompanied by
-tor-browser-2.3.25-13_en-US.exe.asc. For a list
+torbrowser-install-version-torbrowserbundle_en-US.exe is accompanied by
+torbrowser-install-version-torbrowserbundle_en-US.exe.asc. For a list
 of which developer signs which package, see our a href=page 
docs/signing-keyssigning keys/a page./p
 h3Windows/h3
 hr
@@ -67,20 +67,20 @@
 you will need to tell Windows the full path to the GnuPG program. If
 you installed GnuPG with the default values, the path should be
 something like this: iC:\Program Files\Gnu\GnuPg\gpg.exe/i./p
-pErinn Clark signs the Tor Browsers. Import her key
-(0x416F061063FEE659) by starting icmd.exe/i and typing:/p
-preC:\Program Files\Gnu\GnuPg\gpg.exe --keyserver 
x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659/pre
+pThe Tor Browser team signs the Tor Browsers. Import its key
+(0x4E2C6E8793298290) by starting icmd.exe/i and typing:/p
+preC:\Program Files\Gnu\GnuPg\gpg.exe --keyserver 
x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290/pre
 pAfter importing the key, you can verify that the fingerprint
 is correct:/p
-preC:\Program Files\Gnu\GnuPg\gpg.exe --fingerprint 
0x416F061063FEE659/pre
+preC:\Program Files\Gnu\GnuPg\gpg.exe --fingerprint 
0x4E2C6E8793298290/pre
 pYou should see:/p
 pre
-pub   2048R/63FEE659 2003-10-16
-  Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659
-uid  Erinn Clark lt;er...@torproject.orggt;
-uid  Erinn Clark lt;er...@debian.orggt;
-uid  Erinn Clark lt;er...@double-helix.orggt;
-sub   2048R/EB399FD7 2003-10-16
+pub   4096R/93298290 2014-12-15
+  Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
+uid  Tor Browser Developers (signing key) 
torbrow...@torproject.org
+sub   4096R/F65C2036 2014-12-15
+sub   4096R/D40814E0 2014-12-15
+sub   4096R/589839A3 2014-12-15
 /pre
 pTo verify the signature of the package you downloaded, you will need
 to download the .asc file as well. Assuming you downloaded the
@@ -88,13 +88,11 @@
 preC:\Program Files\Gnu\GnuPg\gpg.exe --verify 
C:\Users\Alice\Desktop\torbrowser-install-version-torbrowserbundle_en-US.exe.asc
 
C:\Users\Alice\Desktop\torbrowser-install-version-torbrowserbundle_en-US.exe/pre
 pThe output should say Good signature: /p
 pre
-gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 
63FEE659
-gpg: Good signature from Erinn Clark lt;er...@torproject.orggt;
-gpg: aka Erinn Clark lt;er...@debian.orggt;
-gpg: aka Erinn Clark lt;er...@double-helix.orggt;
+gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID 
D40814E0
+gpg: Good signature from Tor Browser Developers (signing key) 
torbrow...@torproject.org
 gpg: WARNING: This key is not certified with a trusted signature!
 gpg:  There is no indication that the signature belongs to the 
owner.
-Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659
+Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
 /pre
 p
 Notice that there is a warning because you haven't assigned a trust
@@ -118,21 +116,21 @@
 key (0x416F061063FEE659) by starting the terminal (under Applications
 in Mac OS X) and typing:/p
 
-pregpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 
0x416F061063FEE659/pre
+pregpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 
0x4E2C6E8793298290/pre
 
 pAfter importing the key, you can verify that the fingerprint
 is correct:/p
 
-pregpg --fingerprint 0x416F061063FEE659/pre
+pregpg --fingerprint 0x4E2C6E8793298290/pre
 
 pYou should see:/p
 pre
-pub   2048R/63FEE659 2003-10-16
-  Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659
-uid  Erinn Clark lt;er...@torproject.orggt;
-uid  Erinn Clark lt;er...@debian.orggt;
-uid  Erinn Clark lt;er...@double-helix.orggt;
-sub   2048R/EB399FD7 2003-10-16
+pub   

[tor-commits] [webwml/staging] Note that we're not taking part in GSoC 2015

2015-03-13 Thread sebastian
commit 169592e0f03206592d2897907d5f812539ec4108
Author: Damian Johnson ata...@torproject.org
Date:   Wed Mar 11 09:31:03 2015 -0700

Note that we're not taking part in GSoC 2015

This page at least should mention it to avoid potential confusion.
---
 about/en/gsoc.wml |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml
index c9f53c0..2bc01f3 100644
--- a/about/en/gsoc.wml
+++ b/about/en/gsoc.wml
@@ -11,7 +11,11 @@
   div id=maincol 
 h2Tor: Google Summer of Code 2015/h2
 hr
-
+
+h3IMPORTANT NOTE: Tor a 
href=https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html;was
 not accepted/a into GSoC 2015, hopefully we'll be back next year!/h3
+
+br /br /
+
 p
 The Tor Project, in collaboration with a href=https://www.eff.org/;The
 Electronic Frontier Foundation/a, have taken part in Google Summer of 
Code



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


[tor-commits] [webwml/staging] Exitmap Improvements project idea

2015-03-13 Thread sebastian
commit 85e16b459be0f85e4d22e2774714b84d8ada349e
Author: Damian Johnson ata...@torproject.org
Date:   Sat Feb 21 11:44:02 2015 -0800

Exitmap Improvements project idea
---
 getinvolved/en/volunteer.wml |   36 
 1 file changed, 36 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 2b8362f..7755501 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1484,6 +1484,42 @@ There are several possible directions for this project, 
including...
 /ol
 /p
 /li
+
+a id=exitmap_improvements/a
+li
+bExitmap Improvements/b
+br
+Effort Level: iMedium/i
+br
+Skill Level: iMedium/i
+br
+Likely Mentors: iPhilipp (phw)/i
+p
+The Tor Project makes use of the Python tool a
+href=https://gitweb.torproject.org/user/phw/exitmap.git/;Exitmap/a to
+systematically scan for malicious and misbehaving exit relays.  Once such a
+relay is found, it is assigned the BadExit flag which prevents clients from
+selecting the relay as last hop in their circuit.
+/p
+
+p
+Exitmap supports scanning modules which implement a specific scan over
+exit relays.  Examples are the DNS module which checks for DNS poisoning
+or the patching check module which looks out for tampered file
+downloads.
+/p
+
+p
+This project is meant to extend exitmap in several ways.  First, it
+should be made fully autonomous.  That means that exitmap should be able
+to run in the background, periodically fetch new relay descriptors, and
+have a smart algorithm which keeps scanning all exit relays
+periodically.  Second, exitmap should be able to emulate some user
+interaction and dynamically explore the web in order to detect
+tampering.  Third, unit tests should be added for existing and new code
+in order to make the code base more robust.
+/p
+/li
 !--
 a id=improveStegotorus/a
 li



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


[tor-commits] [webwml/staging] Bug 13407: Finish updating signature verification

2015-03-13 Thread sebastian
commit 5d6192e86d8ed588acf51fae455a0a4955369347
Author: Nicolas Vigier bo...@torproject.org
Date:   Thu Mar 5 14:46:13 2015 +0100

Bug 13407: Finish updating signature verification

A part of the page was not updated:
https://lists.torproject.org/pipermail/tor-dev/2015-March/008375.html
---
 docs/en/verifying-signatures.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index a489703..ef916b4 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -112,8 +112,8 @@
 /p
 
 pThe next step is to use GnuPG to import the key that signed
-your package. Erinn Clark signs the Tor Browsers. Import her
-key (0x416F061063FEE659) by starting the terminal (under Applications
+your package. The Tor Browser team signs the Tor Browsers. Import its
+key (0x4E2C6E8793298290) by starting the terminal (under Applications
 in Mac OS X) and typing:/p
 
 pregpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 
0x4E2C6E8793298290/pre



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


[tor-commits] [webwml/staging] make the new tor browser key super obvious

2015-03-13 Thread sebastian
commit 1857af8ba7570bfe8fe6dedeede373e857898754
Author: Roger Dingledine a...@torproject.org
Date:   Thu Feb 26 11:57:41 2015 -0500

make the new tor browser key super obvious
---
 docs/en/signing-keys.wml |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 2398ba7..d17fcae 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -14,18 +14,19 @@
 
 pThe signing keys we use are:/p
 ul
+liThe Tor Browser Developers (0x93298290),
+Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
+Nicolas Vigier (0xD0220E4B) and Linus Nordberg (0x23291265)
+sign the Tor Browser releases./li
 liRoger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson
 (0x165733EA, or its subkey 0x8D29319A) sign the Tor source code
 tarballs./li
-liErinn Clark (0x63FEE659) signs the Tor Browser Bundles
+liErinn Clark (0x63FEE659) signed earlier Tor Browser Bundles
 and many other packages. She signs RPMs with her other key
 (0xF1F5C9B5). Andrew Lewman (0x31B0974B, 0x6B4D6475) used to sign
 packages for RPMs, Windows, and OS X./li
 liTor Project Archive (0x886DDD89) signs the deb.torproject.org
 repositories and archives./li
-liMike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
-Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), and the
-Tor Browser Developers (0x93298290) sign the Tor Browser releases./li
 liDamian Johnson (0x9ABBEEC6) signs Arm releases./li
 liSebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign 
Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor 
Browser Bundles./li
 liThe Tails team (0xBE2CD9C1) signs the Tails live system



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


[tor-commits] [webwml/staging] Deprecate old TBB versions

2015-03-13 Thread sebastian
commit dde69c25a12e726c77f9b8170ab3af9f263aa773
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 17:11:30 2015 +

Deprecate old TBB versions
---
 projects/torbrowser/RecommendedTBBVersions |4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 86125ee..2bd096b 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -1,8 +1,4 @@
 [
-4.0.3,
-4.0.3-Linux,
-4.0.3-MacOS,
-4.0.3-Windows,
 4.0.4,
 4.0.4-Linux,
 4.0.4-MacOS,



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


[tor-commits] [webwml/staging] last change here i hope!

2015-03-13 Thread sebastian
commit 956d0539d780783d774b488a38713a4063ea608c
Author: Roger Dingledine a...@torproject.org
Date:   Wed Mar 11 18:34:53 2015 -0400

last change here i hope!
---
 getinvolved/en/tshirt.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml
index 8161c62..0663bd5 100644
--- a/getinvolved/en/tshirt.wml
+++ b/getinvolved/en/tshirt.wml
@@ -43,7 +43,7 @@
 
 p
 If you get such a mail, or you've done something else cool,
-email us at tsh...@lists.torproject.org with the details.
+email us at tsh...@torproject.org with the details.
 /p
 
 p



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


[tor-commits] [webwml/staging] fix tshirt url for now, pending #13076

2015-03-13 Thread sebastian
commit ee5ed029e5d44de2cbcd00f854379519f2265a96
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Mar 11 18:42:32 2015 +0100

fix tshirt url for now, pending #13076
---
 getinvolved/en/tshirt.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml
index f7fa0b7..8161c62 100644
--- a/getinvolved/en/tshirt.wml
+++ b/getinvolved/en/tshirt.wml
@@ -43,7 +43,7 @@
 
 p
 If you get such a mail, or you've done something else cool,
-email us at tshi...@torproject.org with the details.
+email us at tsh...@lists.torproject.org with the details.
 /p
 
 p



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


[tor-commits] [webwml/staging] Point people to tshirts@

2015-03-13 Thread sebastian
commit 575767d817e237493afda76459ee68d549a576f0
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Mar 11 18:15:07 2015 +0100

Point people to tshirts@
---
 getinvolved/en/tshirt.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml
index 4a156d6..f7fa0b7 100644
--- a/getinvolved/en/tshirt.wml
+++ b/getinvolved/en/tshirt.wml
@@ -43,7 +43,7 @@
 
 p
 If you get such a mail, or you've done something else cool,
-email us at donati...@torproject.org with the details.
+email us at tshi...@torproject.org with the details.
 /p
 
 p



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


[tor-commits] [webwml/staging] added comma

2015-03-13 Thread sebastian
commit 9f844e125cbcecd1339163e730acd5700b588947
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 18:28:36 2015 +

added comma
---
 projects/torbrowser/RecommendedTBBVersions |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index cd7baca..2ff6814 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -6,7 +6,7 @@
 4.5a3,
 4.5a3-Linux,
 4.5a3-MacOS,
-4.5a3-Windows
+4.5a3-Windows,
 4.5a4,
 4.5a4-Linux,
 4.5a4-MacOS,



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


[tor-commits] [webwml/staging] Eradicate tabs from the board page

2015-03-13 Thread sebastian
commit 0ab39cb8cdd1c7eccdbf1523920fba3be29f6109
Author: Sebastian Hahn sebast...@torproject.org
Date:   Fri Mar 13 23:55:57 2015 +0100

Eradicate tabs from the board page
---
 about/en/board.wml |   54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 79d82ac..df00fd2 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -4,47 +4,47 @@
 
 #include head.wmi TITLE=Tor Project: Board of Directors CHARSET=UTF-8
 div id=content class=clearfix
-   div id=breadcrumbs
+  div id=breadcrumbs
 a href=page indexHome raquo; /a
 a href=page about/overviewAbout raquo; /a
 a href=page about/boardBoard of Directors/a
   /div
-   div id=maincol
-   h1Board of Directors/h1
+  div id=maincol
+h1Board of Directors/h1
 table
-   tr
+  tr
 td class=beige
- div class=nameRoger Dingledine/div
- div class=capsPresident and Director/div
-   pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
-   /td
-   td
+div class=nameRoger Dingledine/div
+div class=capsPresident and Director/div
+  pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
+  /td
+  td
   div class=nameMeredith Hoban-Dunn/div
- div class=capsAudit Committee Chair/div
+div class=capsAudit Committee Chair/div
pMeredith is an accomplished accountant, advisor, and banker.  
Her role is to help us make sure we're able to pass our corporate audits 
correctly, watch for internal fraud, tell us when we're doing things in a 
non-standard way, and so on./p
 /td
   /tr
   tr
 td
   div class=nameIan Goldberg/div
- div class=capsChairman of the Board/div
+div class=capsChairman of the Board/div
   pCryptographer, privacy expert, and professor; one of the 
designers of a href=http://www.cypherpunks.ca/otr/;Off-the-Record 
Messaging/a./p
 /td
-   td class=beige
- div class=nameAndrew Lewman/div
- div class=capsSecretary, Treasurer, and Executive Director/div
- pAndrew is the Executive Director responsible for all
- operations of The Tor Project, Inc.  His other activities
- can be found at a href=http://lewman.is;his website/a./p
-   /td
+  td class=beige
+div class=nameAndrew Lewman/div
+div class=capsSecretary, Treasurer, and Executive Director/div
+pAndrew is the Executive Director responsible for all
+operations of The Tor Project, Inc.  His other activities
+can be found at a href=http://lewman.is;his website/a./p
+  /td
 /tr
 tr
-   td class=beige
- div class=nameNick Mathewson/div
- div class=capsVice-President and Director/div
- pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
-/td
-td
+  td class=beige
+div class=nameNick Mathewson/div
+div class=capsVice-President and Director/div
+pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
+   /td
+   td
 div class=nameRabbi Rob Thomas/div
 div class=capsDirector/div
   pRob is CEO and founder of Team Cymru, and a
@@ -53,9 +53,9 @@
 /td
   /tr
   tr
-   td
+  td
   div class=nameCaspar Bowden/div
- div class=capsDirector/div
+div class=capsDirector/div
pAn independent advocate for information self-determination
rights, and public understanding of privacy research in
computer science. He is a specialist in data protection policy,
@@ -64,7 +64,7 @@
 /td
 td class=beige
   div class=nameWendy Seltzer/div
- div class=capsDirector/div
+div class=capsDirector/div
pLawyer, cyberlaw professor, and founder of a 
href=http://chillingeffects.org/;ChillingEffects.org/a./p
 /td
   /tr



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


[tor-commits] [webwml/staging] 0.2.6 is now 0.2.6.4-rc

2015-03-13 Thread sebastian
commit 2cfe5bca050a8dee9e29ac2e692cac2ca11cc1e5
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Mar 9 21:40:41 2015 -0400

0.2.6 is now 0.2.6.4-rc
---
 Makefile |2 +-
 include/versions.wmi |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7cc2fda..a28fe2b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.5.10
-export DEVTAG=tor-0.2.6.3-alpha
+export DEVTAG=tor-0.2.6.4-rc
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index f448298..53f74e3 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 define-tag version-stable whitespace=delete0.2.5.10/define-tag
-define-tag version-alpha whitespace=delete0.2.6.3-alpha/define-tag
+define-tag version-alpha whitespace=delete0.2.6.4-rc/define-tag
 
 define-tag version-win32-stable whitespace=delete0.2.5.10/define-tag
 define-tag version-win32-alpha whitespace=delete0.2.5.10/define-tag



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


[tor-commits] [webwml/staging] Add new TBB version

2015-03-13 Thread sebastian
commit 4d5f05496b7278d66a7a9544003006a84334491a
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 11:12:06 2015 +

Add new TBB version
---
 projects/torbrowser/RecommendedTBBVersions |4 
 1 file changed, 4 insertions(+)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 4a5eb92..86125ee 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 4.0.3-Linux,
 4.0.3-MacOS,
 4.0.3-Windows,
+4.0.4,
+4.0.4-Linux,
+4.0.4-MacOS,
+4.0.4-Windows,
 4.5a3,
 4.5a3-Linux,
 4.5a3-MacOS,



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


[tor-commits] [webwml/staging] Bump Tor Browser version to 4.0.4

2015-03-13 Thread sebastian
commit 7e2b3c8b2669ac4a2f8ca6a021291e62532fd834
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 11:24:23 2015 +

Bump Tor Browser version to 4.0.4
---
 include/versions.wmi |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 6d02728..977b8a3 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -19,10 +19,10 @@
 define-tag version-osx-ppc-stable whitespace=delete0.2.3.25/define-tag
 define-tag version-osx-ppc-alpha whitespace=delete0.2.4.17-rc/define-tag
 
-define-tag version-torbrowserbundledir whitespace=delete4.0.3/define-tag
+define-tag version-torbrowserbundledir whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5a3/define-tag
 
-define-tag version-torbrowserbundle whitespace=delete4.0.3/define-tag
+define-tag version-torbrowserbundle whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundlebeta whitespace=delete4.5a3/define-tag
 define-tag version-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e/define-tag
@@ -32,8 +32,8 @@
 define-tag version-torbrowser-otr whitespace=delete3.2/define-tag
 define-tag version-torimbrowserbundle whitespace=delete1.3.21/define-tag
 
-define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.3/define-tag
-define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.3/define-tag
+define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.4/define-tag
+define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5a3/define-tag
 define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5a3/define-tag
 define-tag version-gnu-torbrowser-tor whitespace=delete0.2.4.19/define-tag
@@ -41,7 +41,7 @@
 define-tag version-gnu-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
 define-tag version-gnu-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
 
-define-tag version-torbrowserbundleosx32 whitespace=delete4.0.3/define-tag
+define-tag version-torbrowserbundleosx32 whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundleosx64 
whitespace=delete2.3.25-15/define-tag
 define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5a3/define-tag
 define-tag version-osx-torbrowser-tor whitespace=delete0.2.4.19/define-tag



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


[tor-commits] [webwml/staging] Add new TBB alpha version

2015-03-13 Thread sebastian
commit 8f970dde5cda1bf4a0a4de4865be35834cb27b80
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 17:31:23 2015 +

Add new TBB alpha version
---
 include/versions.wmi   |   10 +-
 projects/torbrowser/RecommendedTBBVersions |4 
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 977b8a3..f448298 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -20,10 +20,10 @@
 define-tag version-osx-ppc-alpha whitespace=delete0.2.4.17-rc/define-tag
 
 define-tag version-torbrowserbundledir whitespace=delete4.0.4/define-tag
-define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5a3/define-tag
+define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5a4/define-tag
 
 define-tag version-torbrowserbundle whitespace=delete4.0.4/define-tag
-define-tag version-torbrowserbundlebeta whitespace=delete4.5a3/define-tag
+define-tag version-torbrowserbundlebeta whitespace=delete4.5a4/define-tag
 define-tag version-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e/define-tag
 define-tag version-torbrowser-firefox whitespace=delete24.2.0esr/define-tag
@@ -34,8 +34,8 @@
 
 define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.4/define-tag
-define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5a3/define-tag
-define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5a3/define-tag
+define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5a4/define-tag
+define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5a4/define-tag
 define-tag version-gnu-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-gnu-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.0k/define-tag
 define-tag version-gnu-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
@@ -43,7 +43,7 @@
 
 define-tag version-torbrowserbundleosx32 whitespace=delete4.0.4/define-tag
 define-tag version-torbrowserbundleosx64 
whitespace=delete2.3.25-15/define-tag
-define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5a3/define-tag
+define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5a4/define-tag
 define-tag version-osx-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-osx-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
 define-tag version-osx-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 2bd096b..cd7baca 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -7,4 +7,8 @@
 4.5a3-Linux,
 4.5a3-MacOS,
 4.5a3-Windows
+4.5a4,
+4.5a4-Linux,
+4.5a4-MacOS,
+4.5a4-Windows
 ]



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


[tor-commits] [webwml/staging] Deprecate old Tor Browser alpha version

2015-03-13 Thread sebastian
commit 228cab34839cef43be4f58b166b5fff27487708b
Author: Georg Koppen g...@torproject.org
Date:   Wed Feb 25 19:06:18 2015 +

Deprecate old Tor Browser alpha version
---
 projects/torbrowser/RecommendedTBBVersions |4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 2ff6814..3d43bbb 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,10 +3,6 @@
 4.0.4-Linux,
 4.0.4-MacOS,
 4.0.4-Windows,
-4.5a3,
-4.5a3-Linux,
-4.5a3-MacOS,
-4.5a3-Windows,
 4.5a4,
 4.5a4-Linux,
 4.5a4-MacOS,



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


[tor-commits] [webwml/staging] Fix the colorscheme

2015-03-13 Thread sebastian
commit 366115d5e08b3ed9f4cc7c5f2ed275c44f67e78b
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:16:11 2015 +0100

Fix the colorscheme
---
 about/en/board.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index c4da922..0db1ccd 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -97,7 +97,7 @@
 /td
   /tr
   tr
-td class=beige
+td
   div class=nameAndrew Lewman/div
   div class=capsSecretary, Treasurer, and Executive Director/div
   p

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


[tor-commits] [webwml/master] Fix the colorscheme

2015-03-13 Thread sebastian
commit 366115d5e08b3ed9f4cc7c5f2ed275c44f67e78b
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:16:11 2015 +0100

Fix the colorscheme
---
 about/en/board.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index c4da922..0db1ccd 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -97,7 +97,7 @@
 /td
   /tr
   tr
-td class=beige
+td
   div class=nameAndrew Lewman/div
   div class=capsSecretary, Treasurer, and Executive Director/div
   p



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


[tor-commits] [webwml/master] Make this table even

2015-03-13 Thread sebastian
commit 19547e39e8cf567cb15ec308281bb4b09beec283
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:20:03 2015 +0100

Make this table even
---
 about/en/board.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 0db1ccd..040e751 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -13,7 +13,7 @@
 h1Board of Directors/h1
 table
   tr
-td
+td style=width:50%;
   div class=nameCaspar Bowden/div
   div class=capsDirector/div
   p
@@ -24,7 +24,7 @@
 management, and information ethics and philosophy.
   /p
 /td
-td class=beige
+td class=beige style=width:50%;
   div class=nameNick Mathewson/div
   div class=capsVice-President and Director/div
   p

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


[tor-commits] [webwml/master] Add Julius to board page, reformat

2015-03-13 Thread sebastian
commit 351487b838f440dd09df07d57da2a5a77a56873f
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sat Mar 14 00:09:56 2015 +0100

Add Julius to board page, reformat
---
 about/en/board.wml |  122 ++--
 1 file changed, 81 insertions(+), 41 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index df00fd2..c4da922 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -13,59 +13,99 @@
 h1Board of Directors/h1
 table
   tr
+td
+  div class=nameCaspar Bowden/div
+  div class=capsDirector/div
+  p
+An independent advocate for information self-determination
+rights, and public understanding of privacy research in
+computer science. He is a specialist in data protection
+policy, EU and US surveillance law, PET research, identity
+management, and information ethics and philosophy.
+  /p
+/td
 td class=beige
-div class=nameRoger Dingledine/div
-div class=capsPresident and Director/div
-  pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
-  /td
-  td
-  div class=nameMeredith Hoban-Dunn/div
-div class=capsAudit Committee Chair/div
-   pMeredith is an accomplished accountant, advisor, and banker.  
Her role is to help us make sure we're able to pass our corporate audits 
correctly, watch for internal fraud, tell us when we're doing things in a 
non-standard way, and so on./p
+  div class=nameNick Mathewson/div
+  div class=capsVice-President and Director/div
+  p
+Nick is one of the original developers of Tor.  He's the
+Chief Architect of The Tor Project, Inc.
+  /p
+/td
+  /tr
+  tr
+td class=beige
+  div class=nameRoger Dingledine/div
+  div class=capsPresident and Director/div
+  p
+Original developer of Tor along with Nick Mathewson and Paul
+Syverson. Leading researcher in the anonymous communications
+field.  Frequent speaker at conferences to advocate Tor and
+explain what Tor is and can do. Helps coordinate academic
+researchers.
+  /p
+/td
+td
+  div class=nameJulius Mittenzwei/div
+  div class=capsDirector/div
+  p
+Germany-based lawyer and Internet activist.
+  /p
 /td
   /tr
   tr
 td
   div class=nameIan Goldberg/div
-div class=capsChairman of the Board/div
-  pCryptographer, privacy expert, and professor; one of the 
designers of a href=http://www.cypherpunks.ca/otr/;Off-the-Record 
Messaging/a./p
+  div class=capsChairman of the Board/div
+  p
+Cryptographer, privacy expert, and professor; one of the
+designers of a
+href=http://www.cypherpunks.ca/otr/;Off-the-Record
+Messaging/a.
+  /p
 /td
-  td class=beige
-div class=nameAndrew Lewman/div
-div class=capsSecretary, Treasurer, and Executive Director/div
-pAndrew is the Executive Director responsible for all
-operations of The Tor Project, Inc.  His other activities
-can be found at a href=http://lewman.is;his website/a./p
-  /td
-/tr
-tr
-  td class=beige
-div class=nameNick Mathewson/div
-div class=capsVice-President and Director/div
-pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
-   /td
-   td
-div class=nameRabbi Rob Thomas/div
-div class=capsDirector/div
-  pRob is CEO and founder of Team Cymru, and a
-  Cymru Fellow. You can learn more about Rob at the a
-  href=http://www.team-cymru.org/;Team Cymru/a websites./p
+td class=beige
+  div class=nameWendy Seltzer/div
+  div class=capsDirector/div
+  p
+Lawyer, cyberlaw professor, and founder of a
+href=http://chillingeffects.org/;ChillingEffects.org/a.
+  /p
 /td
   /tr
   tr
-  td
-  div class=nameCaspar Bowden/div
-div class=capsDirector/div
-   pAn independent advocate for information self-determination
-   rights, and public understanding of privacy research in
-   computer science. He is a specialist in data protection policy,
-   EU and US surveillance law, PET research, identity management,
-   and information ethics and philosophy./p
+td class=beige
+  div class=nameMeredith Hoban-Dunn/div
+  div class=capsAudit Committee Chair/div
+  p
+Meredith is an accomplished accountant, advisor, and
+   

[tor-commits] [webwml/master] Eradicate tabs from the board page

2015-03-13 Thread sebastian
commit 0ab39cb8cdd1c7eccdbf1523920fba3be29f6109
Author: Sebastian Hahn sebast...@torproject.org
Date:   Fri Mar 13 23:55:57 2015 +0100

Eradicate tabs from the board page
---
 about/en/board.wml |   54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 79d82ac..df00fd2 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -4,47 +4,47 @@
 
 #include head.wmi TITLE=Tor Project: Board of Directors CHARSET=UTF-8
 div id=content class=clearfix
-   div id=breadcrumbs
+  div id=breadcrumbs
 a href=page indexHome raquo; /a
 a href=page about/overviewAbout raquo; /a
 a href=page about/boardBoard of Directors/a
   /div
-   div id=maincol
-   h1Board of Directors/h1
+  div id=maincol
+h1Board of Directors/h1
 table
-   tr
+  tr
 td class=beige
- div class=nameRoger Dingledine/div
- div class=capsPresident and Director/div
-   pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
-   /td
-   td
+div class=nameRoger Dingledine/div
+div class=capsPresident and Director/div
+  pOriginal developer of Tor along with Nick Mathewson and Paul 
Syverson. Leading researcher in the anonymous communications field.  Frequent 
speaker at conferences to advocate Tor and explain what Tor is and can do. 
Helps coordinate academic researchers./p
+  /td
+  td
   div class=nameMeredith Hoban-Dunn/div
- div class=capsAudit Committee Chair/div
+div class=capsAudit Committee Chair/div
pMeredith is an accomplished accountant, advisor, and banker.  
Her role is to help us make sure we're able to pass our corporate audits 
correctly, watch for internal fraud, tell us when we're doing things in a 
non-standard way, and so on./p
 /td
   /tr
   tr
 td
   div class=nameIan Goldberg/div
- div class=capsChairman of the Board/div
+div class=capsChairman of the Board/div
   pCryptographer, privacy expert, and professor; one of the 
designers of a href=http://www.cypherpunks.ca/otr/;Off-the-Record 
Messaging/a./p
 /td
-   td class=beige
- div class=nameAndrew Lewman/div
- div class=capsSecretary, Treasurer, and Executive Director/div
- pAndrew is the Executive Director responsible for all
- operations of The Tor Project, Inc.  His other activities
- can be found at a href=http://lewman.is;his website/a./p
-   /td
+  td class=beige
+div class=nameAndrew Lewman/div
+div class=capsSecretary, Treasurer, and Executive Director/div
+pAndrew is the Executive Director responsible for all
+operations of The Tor Project, Inc.  His other activities
+can be found at a href=http://lewman.is;his website/a./p
+  /td
 /tr
 tr
-   td class=beige
- div class=nameNick Mathewson/div
- div class=capsVice-President and Director/div
- pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
-/td
-td
+  td class=beige
+div class=nameNick Mathewson/div
+div class=capsVice-President and Director/div
+pNick is one of the original developers of Tor.  He's the Chief 
Architect of The Tor Project, Inc./p
+   /td
+   td
 div class=nameRabbi Rob Thomas/div
 div class=capsDirector/div
   pRob is CEO and founder of Team Cymru, and a
@@ -53,9 +53,9 @@
 /td
   /tr
   tr
-   td
+  td
   div class=nameCaspar Bowden/div
- div class=capsDirector/div
+div class=capsDirector/div
pAn independent advocate for information self-determination
rights, and public understanding of privacy research in
computer science. He is a specialist in data protection policy,
@@ -64,7 +64,7 @@
 /td
 td class=beige
   div class=nameWendy Seltzer/div
- div class=capsDirector/div
+div class=capsDirector/div
pLawyer, cyberlaw professor, and founder of a 
href=http://chillingeffects.org/;ChillingEffects.org/a./p
 /td
   /tr



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


[tor-commits] [tor-messenger-build/master] Set commit for mingw-w64

2015-03-13 Thread boklm
commit bf7a6b4e1a115badc1e2458b1c18c4e2782a862a
Author: Nicolas Vigier bo...@torproject.org
Date:   Fri Mar 13 09:37:02 2015 +0100

Set commit for mingw-w64
---
 projects/mingw-w64/config |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 020cb70..31ec1f1 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -2,7 +2,7 @@
 filename: '[% project %]-[% c(version) %]-[% c(var/build_id) %].tar.gz'
 git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
 #git_hash: 469ed5d227202b373409c8a3b4c1358be39b9983
-git_hash: master
+git_hash: bcd8f3f6d3bd4a227e8537010a869ddde711b8f6
 version: '[% c(abbrev) %]'
 remote_docker: 1
 lsb_release:

___
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

2015-03-13 Thread translation
commit bcf497b4065586c37616ff132b140582ecc5bf74
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 10:17:14 2015 +

Update translations for torbutton-torbuttonproperties
---
 ach/torbutton.properties |2 ++
 ady/torbutton.properties |2 ++
 af/torbutton.properties  |2 ++
 ak/torbutton.properties  |2 ++
 am/torbutton.properties  |2 ++
 ar/torbutton.properties  |2 ++
 arn/torbutton.properties |2 ++
 ast/torbutton.properties |2 ++
 az/torbutton.properties  |2 ++
 be/torbutton.properties  |2 ++
 bg/torbutton.properties  |2 ++
 bn/torbutton.properties  |2 ++
 bn_IN/torbutton.properties   |2 ++
 bo/torbutton.properties  |2 ++
 br/torbutton.properties  |2 ++
 bs/torbutton.properties  |2 ++
 ca/torbutton.properties  |2 ++
 cs/torbutton.properties  |2 ++
 csb/torbutton.properties |2 ++
 cv/torbutton.properties  |2 ++
 cy/torbutton.properties  |2 ++
 cy_GB/torbutton.properties   |2 ++
 da/torbutton.properties  |2 ++
 de/torbutton.properties  |2 ++
 dz/torbutton.properties  |2 ++
 el/torbutton.properties  |2 ++
 en/torbutton.properties  |2 ++
 en_GB/torbutton.properties   |2 ++
 eo/torbutton.properties  |2 ++
 es/torbutton.properties  |2 ++
 es_AR/torbutton.properties   |2 ++
 es_CL/torbutton.properties   |2 ++
 es_CO/torbutton.properties   |2 ++
 es_MX/torbutton.properties   |2 ++
 et/torbutton.properties  |2 ++
 eu/torbutton.properties  |2 ++
 fa/torbutton.properties  |2 ++
 fi/torbutton.properties  |2 ++
 fil/torbutton.properties |2 ++
 fo/torbutton.properties  |2 ++
 fr/torbutton.properties  |2 ++
 fr_CA/torbutton.properties   |2 ++
 fur/torbutton.properties |2 ++
 fy/torbutton.properties  |2 ++
 ga/torbutton.properties  |2 ++
 gl/torbutton.properties  |2 ++
 gu/torbutton.properties  |2 ++
 gu_IN/torbutton.properties   |2 ++
 gun/torbutton.properties |2 ++
 ha/torbutton.properties  |2 ++
 he/torbutton.properties  |2 ++
 hi/torbutton.properties  |2 ++
 hr/torbutton.properties  |2 ++
 hr_HR/torbutton.properties   |2 ++
 ht/torbutton.properties  |2 ++
 hu/torbutton.properties  |2 ++
 hy/torbutton.properties  |2 ++
 hy_AM/torbutton.properties   |2 ++
 ia/torbutton.properties  |2 ++
 id/torbutton.properties  |2 ++
 is/torbutton.properties  |2 ++
 it/torbutton.properties  |2 ++
 ja/torbutton.properties  |2 ++
 jv/torbutton.properties  |2 ++
 ka/torbutton.properties  |2 ++
 kk/torbutton.properties  |2 ++
 km/torbutton.properties  |2 ++
 kn/torbutton.properties  |2 ++
 ko/torbutton.properties  |2 ++
 ko_KR/torbutton.properties   |2 ++
 ku/torbutton.properties  |2 ++
 ku_IQ/torbutton.properties   |2 ++
 kw/torbutton.properties  |2 ++
 ky/torbutton.properties  |2 ++
 la/torbutton.properties  |2 ++
 lb/torbutton.properties  |2 ++
 lg/torbutton.properties  |2 ++
 ln/torbutton.properties  |2 ++
 lo/torbutton.properties  |2 ++
 lt/torbutton.properties  |2 ++
 lv/torbutton.properties  |2 ++
 mg/torbutton.properties  |2 ++
 mi/torbutton.properties  |2 ++
 mk/torbutton.properties  |2 ++
 ml/torbutton.properties  |2 ++
 mn/torbutton.properties  |2 ++
 mr/torbutton.properties  |2 ++
 ms_MY/torbutton.properties   |2 ++
 mt/torbutton.properties  |2 ++
 my/torbutton.properties  |2 ++
 nah/torbutton.properties |2 ++
 nap/torbutton.properties |2 ++
 nb/torbutton.properties  |2 ++
 nds/torbutton.properties |2 ++
 ne/torbutton.properties  |2 ++
 nl/torbutton.properties  |2 ++
 nl_BE/torbutton.properties   |2 ++
 nn/torbutton.properties  |2 ++
 nso/torbutton.properties |2 ++
 oc/torbutton.properties  |2 ++
 or/torbutton.properties  |2 ++
 pa/torbutton.properties  |2 ++
 pap/torbutton.properties |2 ++
 pl/torbutton.properties  |2 ++
 pms/torbutton.properties |2 ++
 ps/torbutton.properties  |2 ++
 pt/torbutton.properties  |2 ++
 pt_BR/torbutton.properties   |2 ++
 ro/torbutton.properties  |

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

2015-03-13 Thread translation
commit 1cf0e1a097581c6293c13d69cd86fa618fae2537
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 11:15:44 2015 +

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

diff --git a/nl/torbutton.properties b/nl/torbutton.properties
index 2fb81a6..0777e15 100644
--- a/nl/torbutton.properties
+++ b/nl/torbutton.properties
@@ -2,7 +2,7 @@ torbutton.button.tooltip.disabled = Tor inschakelen
 torbutton.button.tooltip.enabled = Tor uitschakelen
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = Onbekend IP adres
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Onion-site
 torbutton.circuit_display.this_browser = Deze browser
 torbutton.circuit_display.relay = relay
 torbutton.circuit_display.tor_bridge = Bridge

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


[tor-commits] [tor-messenger-build/master] Create tor-messenger tarball in a container

2015-03-13 Thread boklm
commit 27a0e57822506bd93eb2dcd9d35839e7e1aa9e2f
Author: Nicolas Vigier bo...@torproject.org
Date:   Fri Mar 13 14:09:56 2015 +0100

Create tor-messenger tarball in a container

Because the host system may not have 7z installed.

Also, use 7z instead of unzip so we don't have to install both 7z and
unzip.
---
 projects/tor-messenger/build  |4 ++--
 projects/tor-messenger/config |   10 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index b7a3be7..60cb99c 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -3,7 +3,7 @@ set -e
 
 mkdir bundle
 [% IF c(var/windows) -%]
-unzip -d bundle [% c('input_files_by_name/instantbird') %]
+7z x -y -obundle [% c('input_files_by_name/instantbird') %]
 mv bundle/instantbird bundle/Messenger
 [% ELSE -%]
 mkdir bundle/Messenger
@@ -22,7 +22,7 @@ cd bundle/Messenger/extensions
 tar xf ../../../[% c('input_files_by_name/ctypes-otr') %]
 mv ctypes-otr* 'ctypes-otr@tormessenger'
 mkdir tor-launc...@torproject.org
-unzip -q ../../../[% c('input_files_by_name/tor-launcher') %] -d 
tor-launc...@torproject.org
+7z x -y -otor-launc...@torproject.org ../../../[% 
c('input_files_by_name/tor-launcher') %]
 mkdir -p tor-launc...@torproject.org/TorBrowser/Data
 [% IF c(var/windows) -%]
 7z x ../../../[% c('input_files_by_name/tor-browser') %]
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index ea5e6b5..73e2473 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -14,3 +14,13 @@ input_files:
 name: gcc
 enable: '[% c(var/linux) %]'
   - filename: start-tor-messenger
+  - project: docker-image
+
+remote_docker: 1
+lsb_release:
+id: Ubuntu
+release: 12.04
+codename: precise
+var:
+deps:
+- p7zip-full

___
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

2015-03-13 Thread translation
commit 65b7e8d8f46a14714e037fa749700997d836b8dd
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 14:45:46 2015 +

Update translations for torbutton-torbuttonproperties
---
 fr_CA/torbutton.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr_CA/torbutton.properties b/fr_CA/torbutton.properties
index 1b689db..8b167ef 100644
--- a/fr_CA/torbutton.properties
+++ b/fr_CA/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Activer Tor
 torbutton.button.tooltip.enabled = Désactiver Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP inconnue
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Site Oignon
 torbutton.circuit_display.this_browser = Ce navigateur
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = relayer
 torbutton.circuit_display.tor_bridge = Pont
 torbutton.circuit_display.unknown_country = Pays inconnu
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor

___
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

2015-03-13 Thread translation
commit 1bc7304f854ef96c4970e70c8ce2f8a109e0b371
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 11:45:47 2015 +

Update translations for torbutton-torbuttonproperties
---
 zh_CN/torbutton.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index 27fe1e7..3c84582 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = 启用 Tor
 torbutton.button.tooltip.enabled = 禁用 Tor
 torbutton.circuit_display.internet = 互联网
 torbutton.circuit_display.ip_unknown = IP 未知
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = 洋葱网站
 torbutton.circuit_display.this_browser = 本浏览器
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = 中继
 torbutton.circuit_display.tor_bridge = 网桥
 torbutton.circuit_display.unknown_country = 未知国家
 torbutton.panel.tooltip.disabled = 点击启用 Tor

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


[tor-commits] [metrics-web/master] Add graph for unique .onion addresses.

2015-03-13 Thread karsten
commit 534930bd5f0df49c1e6383667deeddfcbad49e0d
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Fri Mar 13 16:18:34 2015 +0100

Add graph for unique .onion addresses.
---
 website/etc/web.xml|4 
 website/rserve/graphs.R|   21 
 .../metrics/web/graphs/GraphsSubpagesServlet.java  |2 ++
 .../metrics/web/graphs/RObjectGenerator.java   |2 ++
 website/web/WEB-INF/hidserv-data.jsp   |1 +
 website/web/WEB-INF/index.jsp  |1 +
 6 files changed, 31 insertions(+)

diff --git a/website/etc/web.xml b/website/etc/web.xml
index b9049ac..09c0a8b 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -65,6 +65,7 @@
 url-pattern/torperf-data.html/url-pattern
 url-pattern/connbidirect-data.html/url-pattern
 url-pattern/hidserv-data.html/url-pattern
+url-pattern/hidserv-dir-onions-seen.html/url-pattern
   /servlet-mapping
 
   servlet
@@ -246,6 +247,9 @@
 url-pattern/advbwdist-relay.png/url-pattern
 url-pattern/advbwdist-relay.pdf/url-pattern
 url-pattern/advbwdist-relay.svg/url-pattern
+url-pattern/hidserv-dir-onions-seen.png/url-pattern
+url-pattern/hidserv-dir-onions-seen.pdf/url-pattern
+url-pattern/hidserv-dir-onions-seen.svg/url-pattern
   /servlet-mapping
 
   servlet
diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index 00dfe39..7f68854 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -989,3 +989,24 @@ plot_advbwdist_relay - function(start, end, n, path) {
   ggsave(filename = path, width = 8, height = 5, dpi = 72)
 }
 
+plot_hidserv_dir_onions_seen - function(start, end, path) {
+  end - min(end, as.character(Sys.Date() - 2))
+  h - read.csv(paste(/srv/metrics.torproject.org/web/shared/stats/,
+hidserv.csv, sep = ), stringsAsFactors = FALSE)
+  h - h[h$date = start  h$date = end  h$type == dir-onions-seen, ]
+  h - rbind(data.frame(date = NA, wiqm = 0),
+ data.frame(date = as.Date(h$date, %Y-%m-%d),
+wiqm = ifelse(h$frac = 0.01, h$wiqm, NA)))
+  date_breaks - date_breaks(as.numeric(max(h$date, na.rm = TRUE)
+  - min(h$date, na.rm = TRUE)))
+  ggplot(h, aes(x = date, y = wiqm)) +
+geom_line(size = 0.75) +
+scale_x_date(name = paste(\nThe Tor Project - ,
+https://metrics.torproject.org/;, sep = ),
+format = date_breaks$format, major = date_breaks$major,
+minor = date_breaks$minor) +
+scale_y_continuous(name = ) +
+opts(title = Unique .onion addresses\n)
+  ggsave(filename = path, width = 8, height = 5, dpi = 72)
+}
+
diff --git 
a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java 
b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
index beb3e69..0333f4d 100644
--- a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
+++ b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
@@ -92,6 +92,8 @@ public class GraphsSubpagesServlet extends HttpServlet {
 WEB-INF/connbidirect-data.jsp);
 this.availableGraphsSubpages.put(hidserv-data.html,
 WEB-INF/hidserv-data.jsp);
+this.availableGraphsSubpages.put(hidserv-dir-onions-seen.html,
+WEB-INF/hidserv-dir-onions-seen.jsp);
 
 this.availableGraphsSubpageTables = new HashMapString, String();
 this.availableGraphsSubpageTables.put(userstats-relay-table.html,
diff --git 
a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java 
b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
index 1179137..b598192 100644
--- a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
+++ b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
@@ -86,6 +86,8 @@ public class RObjectGenerator implements 
ServletContextListener {
 start,end,version,filename);
 this.availableGraphs.put(advbwdist-perc, start,end,p,filename);
 this.availableGraphs.put(advbwdist-relay, start,end,n,filename);
+this.availableGraphs.put(hidserv-dir-onions-seen,
+start,end,filename);
 
 this.availableGraphFileTypes = new HashSetString(Arrays.asList(
 png,pdf,svg.split(,)));
diff --git a/website/web/WEB-INF/hidserv-data.jsp 
b/website/web/WEB-INF/hidserv-data.jsp
index 2d9bb31..ef31f86 100644
--- a/website/web/WEB-INF/hidserv-data.jsp
+++ b/website/web/WEB-INF/hidserv-data.jsp
@@ -51,6 +51,7 @@ network fraction./li
 
 h4Related metrics/h4
 ul
+lia href=hidserv-dir-onions-seen.htmlGraph: Unique .onion 
addresses/a/li
 lia href=relayflags.htmlGraph: Relays with Exit, Fast, Guard, Stable, 
and HSDir flags/a/li
 /ul
 
diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp
index 29141e4..182935b 100644
--- a/website/web/WEB-INF/index.jsp
+++ b/website/web/WEB-INF/index.jsp
@@ -89,6 +89,7 @@
 traffic do they handle?/p
 
 ul
+lia 

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

2015-03-13 Thread translation
commit b01fd837e8255ce7a6caab0f14b23f2d1fcd1b53
Author: Translation commit bot translat...@torproject.org
Date:   Fri Mar 13 14:15:46 2015 +

Update translations for torbutton-torbuttonproperties
---
 es/torbutton.properties |4 ++--
 nb/torbutton.properties |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/es/torbutton.properties b/es/torbutton.properties
index 8fdbf20..8007a96 100644
--- a/es/torbutton.properties
+++ b/es/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Habilitar Tor
 torbutton.button.tooltip.enabled = Deshabilitar Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconocida
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Sitio onion
 torbutton.circuit_display.this_browser = Este navegador
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = repetidor
 torbutton.circuit_display.tor_bridge = Repetidor puente (bridge)
 torbutton.circuit_display.unknown_country = País desconocido
 torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor
diff --git a/nb/torbutton.properties b/nb/torbutton.properties
index 179b20e..e06b340 100644
--- a/nb/torbutton.properties
+++ b/nb/torbutton.properties
@@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Aktiver Tor
 torbutton.button.tooltip.enabled = Deaktiver Tor
 torbutton.circuit_display.internet = Internett
 torbutton.circuit_display.ip_unknown = Ukjent IP
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Onion-side
 torbutton.circuit_display.this_browser = Denne nettleseren
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = tor-tilknytning
 torbutton.circuit_display.tor_bridge = Bro
 torbutton.circuit_display.unknown_country = Ukjent land
 torbutton.panel.tooltip.disabled = Klikk for å aktivere Tor

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


[tor-commits] [tor/master] const-ify the new failure vars, and one old one

2015-03-13 Thread nickm
commit 3a68f2f54ed67176a8ed0b7aa276ef58a54b26db
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Mar 13 09:41:49 2015 -0400

const-ify the new failure vars, and one old one
---
 src/common/compat_pthreads.c |   13 ++---
 src/or/control.c |2 +-
 src/or/rendservice.c |2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
index 70259a8..fdc5046 100644
--- a/src/common/compat_pthreads.c
+++ b/src/common/compat_pthreads.c
@@ -91,10 +91,9 @@ static pthread_mutexattr_t attr_recursive;
 void
 tor_mutex_init(tor_mutex_t *mutex)
 {
-  int err;
   if (PREDICT_UNLIKELY(!threads_initialized))
 tor_threads_init();
-  err = pthread_mutex_init(mutex-mutex, attr_recursive);
+  const int err = pthread_mutex_init(mutex-mutex, attr_recursive);
   if (PREDICT_UNLIKELY(err)) {
 log_err(LD_GENERAL, Error %d creating a mutex., err);
 tor_fragile_assert();
@@ -276,16 +275,16 @@ void
 tor_threads_init(void)
 {
   if (!threads_initialized) {
-int ret;
 pthread_mutexattr_init(attr_recursive);
 pthread_mutexattr_settype(attr_recursive, PTHREAD_MUTEX_RECURSIVE);
-ret = pthread_attr_init(attr_detached);
-tor_assert(ret == 0);
+const int ret1 = pthread_attr_init(attr_detached);
+tor_assert(ret1 == 0);
 #ifndef PTHREAD_CREATE_DETACHED
 #define PTHREAD_CREATE_DETACHED 1
 #endif
-ret = pthread_attr_setdetachstate(attr_detached, PTHREAD_CREATE_DETACHED);
-tor_assert(ret == 0);
+const int ret2 =
+  pthread_attr_setdetachstate(attr_detached, PTHREAD_CREATE_DETACHED);
+tor_assert(ret2 == 0);
 threads_initialized = 1;
 set_main_thread();
   }
diff --git a/src/or/control.c b/src/or/control.c
index 819a57f..34d539b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3102,7 +3102,7 @@ handle_control_authchallenge(control_connection_t *conn, 
uint32_t len,
 tor_free(client_nonce);
 return -1;
   }
-  int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN);
+  const int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN);
   tor_assert(!fail);
 
   /* Now compute and send the server-to-controller response, and the
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 77eaea0..eb2748c 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3320,7 +3320,7 @@ rend_services_introduce(void)
   intro = tor_malloc_zero(sizeof(rend_intro_point_t));
   intro-extend_info = extend_info_from_node(node, 0);
   intro-intro_key = crypto_pk_new();
-  int fail = crypto_pk_generate_key(intro-intro_key);
+  const int fail = crypto_pk_generate_key(intro-intro_key);
   tor_assert(!fail);
   intro-time_published = -1;
   intro-time_to_expire = -1;

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


[tor-commits] [tor/master] don't init threads as side effect of assertion

2015-03-13 Thread nickm
commit 68e9f364a01fa8efadd06745d2e54d66646a
Author: Sebastian Hahn sebast...@torproject.org
Date:   Thu Mar 12 17:52:37 2015 +0100

don't init threads as side effect of assertion

Fixes part of bug 15211.
---
 changes/bug15211 |5 +
 src/common/compat_pthreads.c |8 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/changes/bug15211 b/changes/bug15211
new file mode 100644
index 000..b99e61e
--- /dev/null
+++ b/changes/bug15211
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+- Remove side-effects from tor_assert() calls. This was harmless,
+  because we never disable assertions, but it is bad style and
+  unnecessary. Fixes bug 15211; bugfix on 0.2.5.5.
+
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
index 246076b..70259a8 100644
--- a/src/common/compat_pthreads.c
+++ b/src/common/compat_pthreads.c
@@ -276,14 +276,16 @@ void
 tor_threads_init(void)
 {
   if (!threads_initialized) {
+int ret;
 pthread_mutexattr_init(attr_recursive);
 pthread_mutexattr_settype(attr_recursive, PTHREAD_MUTEX_RECURSIVE);
-tor_assert(0==pthread_attr_init(attr_detached));
+ret = pthread_attr_init(attr_detached);
+tor_assert(ret == 0);
 #ifndef PTHREAD_CREATE_DETACHED
 #define PTHREAD_CREATE_DETACHED 1
 #endif
-tor_assert(0==pthread_attr_setdetachstate(attr_detached,
-  PTHREAD_CREATE_DETACHED));
+ret = pthread_attr_setdetachstate(attr_detached, PTHREAD_CREATE_DETACHED);
+tor_assert(ret == 0);
 threads_initialized = 1;
 set_main_thread();
   }



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


[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug15211'

2015-03-13 Thread nickm
commit 833b6d30bec568660e3a9cdeacd1e8c2837f1a6a
Merge: 3ee2fca badc81d
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Mar 13 09:39:04 2015 -0400

Merge remote-tracking branch 'sebastian/bug15211'

 changes/bug15211 |6 ++
 src/common/compat_pthreads.c |8 +---
 src/or/control.c |4 ++--
 src/or/rendservice.c |3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)



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


[tor-commits] [tor/master] Don't init hs intro key as side effect of an assert

2015-03-13 Thread nickm
commit badc81de5bc60c5f53b3c1dd3cf9b1a819ff89c4
Author: Sebastian Hahn sebast...@torproject.org
Date:   Thu Mar 12 18:59:46 2015 +0100

Don't init hs intro key as side effect of an assert
---
 changes/bug15211 |3 ++-
 src/or/rendservice.c |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changes/bug15211 b/changes/bug15211
index b14f5cb..24c189d 100644
--- a/changes/bug15211
+++ b/changes/bug15211
@@ -1,5 +1,6 @@
   o Minor bugfixes:
 - Remove side-effects from tor_assert() calls. This was harmless,
   because we never disable assertions, but it is bad style and
-  unnecessary. Fixes bug 15211; bugfix on 0.2.5.5, 0.2.2.36.
+  unnecessary. Fixes bug 15211; bugfix on 0.2.5.5, 0.2.2.36, and
+  0.2.0.10.
 
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 0368696..77eaea0 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3320,7 +3320,8 @@ rend_services_introduce(void)
   intro = tor_malloc_zero(sizeof(rend_intro_point_t));
   intro-extend_info = extend_info_from_node(node, 0);
   intro-intro_key = crypto_pk_new();
-  tor_assert(!crypto_pk_generate_key(intro-intro_key));
+  int fail = crypto_pk_generate_key(intro-intro_key);
+  tor_assert(!fail);
   intro-time_published = -1;
   intro-time_to_expire = -1;
   intro-time_expiring = -1;



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


[tor-commits] [tor/master] Don't init control authchallenge nonce as assert side effect

2015-03-13 Thread nickm
commit 447769dd283f642f6a84a27a10ac1f3c36ad4900
Author: Sebastian Hahn sebast...@torproject.org
Date:   Thu Mar 12 18:56:48 2015 +0100

Don't init control authchallenge nonce as assert side effect

Fixes part of bug 15211.
---
 changes/bug15211 |2 +-
 src/or/control.c |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/changes/bug15211 b/changes/bug15211
index b99e61e..b14f5cb 100644
--- a/changes/bug15211
+++ b/changes/bug15211
@@ -1,5 +1,5 @@
   o Minor bugfixes:
 - Remove side-effects from tor_assert() calls. This was harmless,
   because we never disable assertions, but it is bad style and
-  unnecessary. Fixes bug 15211; bugfix on 0.2.5.5.
+  unnecessary. Fixes bug 15211; bugfix on 0.2.5.5, 0.2.2.36.
 
diff --git a/src/or/control.c b/src/or/control.c
index e25c3b2..819a57f 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3102,8 +3102,8 @@ handle_control_authchallenge(control_connection_t *conn, 
uint32_t len,
 tor_free(client_nonce);
 return -1;
   }
-
-  tor_assert(!crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN));
+  int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN);
+  tor_assert(!fail);
 
   /* Now compute and send the server-to-controller response, and the
* server's nonce. */



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