[tor-commits] [webwml/master] Delete unused tails icon

[sebastian]

commit 24182b66f35c34a0832aad9138db47e8b55862ef
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:10:15 2014 +0100

Delete unused tails icon
---
 images/icon-Tails.jpg |  Bin 1683 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/icon-Tails.jpg b/images/icon-Tails.jpg
deleted file mode 100644
index 20993d3..000
Binary files a/images/icon-Tails.jpg and /dev/null differ



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

[tor-commits] [webwml/master] update tails logo

[sebastian]

commit 24f243c17f52839485cb66f204becaabddd96897
Author: Nima Fatemi 
Date:   Tue Oct 28 01:21:37 2014 +

update tails logo
---
 en/index.wml |2 +-
 images/tails_logo.png|  Bin 0 -> 21522 bytes
 projects/en/projects.wml |2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/index.wml b/en/index.wml
index 5ee8d4d..8bacbf2 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -58,7 +58,7 @@
   
 
 https://tails.boum.org/";>
+src="$(IMGROOT)/tails_logo.png" alt="Tails Logo">
 https://tails.boum.org/";>Tails
 Live CD/USB operating system preconfigured to use
 Tor safely.
diff --git a/images/tails_logo.png b/images/tails_logo.png
new file mode 100644
index 000..df5f52e
Binary files /dev/null and b/images/tails_logo.png differ
diff --git a/projects/en/projects.wml b/projects/en/projects.wml
index e3f4604..e4cf2e7 100644
--- a/projects/en/projects.wml
+++ b/projects/en/projects.wml
@@ -110,7 +110,7 @@ href="https://stem.torproject.org/";>Stem
 
 
 https://tails.boum.org/";>
 https://tails.boum.org/";>Tails



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

[tor-commits] [webwml/master] update internetdefenseleague link to https ftw

[sebastian]

commit b3233898fb46d1438516989ce91bad7560b32ec9
Author: Nima Fatemi 
Date:   Tue Oct 28 01:24:18 2014 +

update internetdefenseleague link to https ftw
---
 include/foot.wmi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/foot.wmi b/include/foot.wmi
index 7f4a9fc..14e5c45 100644
--- a/include/foot.wmi
+++ b/include/foot.wmi
@@ -62,7 +62,7 @@
 
   
 
-http://internetdefenseleague.org/";>
+https://internetdefenseleague.org/";>
 
   
 

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

[tor-commits] [webwml/master] update mrphs' description on coreppl page

[sebastian]

commit 5d48abf35909f648c48d4df8841c77bd4958b64f
Author: Nima Fatemi 
Date:   Tue Oct 28 00:02:47 2014 +

update mrphs' description on coreppl page
---
 about/en/corepeople.wml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 0dffdc9..2c6ec68 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -95,9 +95,9 @@
   href="https://fteproxy.org/";>fteproxy, and part of the
   pluggable transports team. Grad student at Portland State.
 
-  Nima Fatemi, Support
-  Farsi translator; helps answer all the users who contact
-  the support desk.
+  Nima Fatemi, Support, Advocate
+  Farsi team; helps answer all the users who contact
+  the support desk, does training and outreach and works on 
usability.
 
   David Fifield, Developer, Researcher
   Developer and co-inventor of https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] The short user manual is gone

[sebastian]

commit e49754a4f692dbe2724003bcb98a0dd3218e49f2
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:04:27 2014 +0100

The short user manual is gone

Stop linking to nonexistent binaries and essentially outdated pages.
Inspired by patch to this page from mrphs.
---
 .gitignore|1 -
 docs/en/short-user-manual.wml |   55 -
 docs/en/sidenav.wmi   |4 ---
 docs/torbutton/en/sidenav.wmi |4 ---
 4 files changed, 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8e79d1..4e539a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ docs/pluggable-transports.html.en
 docs/proxychain.html.en
 docs/rpms.html.en
 docs/running-a-mirror.html.en
-docs/short-user-manual.html.en
 docs/signing-keys.html.en
 docs/tor-doc-osx.html.en
 docs/tor-doc-relay.html.en
diff --git a/docs/en/short-user-manual.wml b/docs/en/short-user-manual.wml
deleted file mode 100644
index f1ba1cd..000
--- a/docs/en/short-user-manual.wml
+++ /dev/null
@@ -1,55 +0,0 @@
-## translation metadata
-# Revision: $Revision: 25138 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor Project: FAQ" CHARSET="UTF-8"
-
-  
-Home » 
-Documentation » 
-Short User Manual
-  
-  
-
-Short User Manual
-
-
-The short user manual contains information about how to download
-Tor, how to use it, and what to do if Tor is unable to connect to the
-network. If you can't find the answer to your question in this document,
-email help at rt.torproject.org.
-
-The user manual is available in the following languages:
-
-https://www.torproject.org/dist/manual/short-user-manual_ar.xhtml";>Arabic
-https://www.torproject.org/dist/manual/short-user-manual_zh_CN.xhtml";>Chinese
-https://www.torproject.org/dist/manual/short-user-manual_cs.xhtml";>Czech
-https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml";>Dutch
-   https://torproject.org/dist/manual/short-user-manual_en.xhtml";>English
-https://torproject.org/dist/manual/short-user-manual_fa.xhtml";>Farsi
-https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml";>French
-https://www.torproject.org/dist/manual/short-user-manual_de.xhtml";>German
-https://www.torproject.org/dist/manual/short-user-manual_el.xhtml";>Greek
-https://www.torproject.org/dist/manual/short-user-manual_hu.xhtml";>Hungarian
-https://www.torproject.org/dist/manual/short-user-manual_it.xhtml";>Italian
-https://www.torproject.org/dist/manual/short-user-manual_ja.xhtml";>Japanese
-https://www.torproject.org/dist/manual/short-user-manual_lv.xhtml";>Latvian
-https://www.torproject.org/dist/manual/short-user-manual_nb.xhtml";>Norwegian
-https://www.torproject.org/dist/manual/short-user-manual_pl.xhtml";>Polish
-https://www.torproject.org/dist/manual/short-user-manual_pt_BR.xhtml";>Portuguese
-https://www.torproject.org/dist/manual/short-user-manual_ru.xhtml";>Russian
-https://www.torproject.org/dist/manual/short-user-manual_es.xhtml";>Spanish
-https://www.torproject.org/dist/manual/short-user-manual_sv.xhtml";>Swedish
-https://www.torproject.org/dist/manual/short-user-manual_tr.xhtml";>Turkish
-
-
-  
-  
-  
-#include "side.wmi"
-#include "info.wmi"
-  
-  
-
-
-#include 
diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 8aee928..e0867ed 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -55,10 +55,6 @@
   {'url'  => 'docs/manual',
'txt'  => 'Manuals',
'subelements' => [
-  {   
-   'url'  => 'docs/short-user-manual',
-   'txt'  => 'Short User Manual',
-  }, 
   {'url'  => 'docs/tor-relay-debian',
'txt'  => 'Configuring a Relay manually',
   },
diff --git a/docs/torbutton/en/sidenav.wmi b/docs/torbutton/en/sidenav.wmi
index 0c55730..9b02b91 100644
--- a/docs/torbutton/en/sidenav.wmi
+++ b/docs/torbutton/en/sidenav.wmi
@@ -52,10 +52,6 @@
   {'url'  => 'docs/manual',
'txt'  => 'Manuals',
'subelements' => [
-  {   
-   'url'  => 'docs/short-user-manual',
-   'txt'  => 'Short User Manual',
-  }, 
   {'url'  => 'docs/tor-relay-debian',
'txt'  => 'Configuring a Relay manually',
   },



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

[tor-commits] [webwml/staging] Delete unused tails icon

[sebastian]

commit 24182b66f35c34a0832aad9138db47e8b55862ef
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:10:15 2014 +0100

Delete unused tails icon
---
 images/icon-Tails.jpg |  Bin 1683 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/icon-Tails.jpg b/images/icon-Tails.jpg
deleted file mode 100644
index 20993d3..000
Binary files a/images/icon-Tails.jpg and /dev/null differ



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

[tor-commits] [webwml/staging] update mrphs' description on coreppl page

[sebastian]

commit 5d48abf35909f648c48d4df8841c77bd4958b64f
Author: Nima Fatemi 
Date:   Tue Oct 28 00:02:47 2014 +

update mrphs' description on coreppl page
---
 about/en/corepeople.wml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 0dffdc9..2c6ec68 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -95,9 +95,9 @@
   href="https://fteproxy.org/";>fteproxy, and part of the
   pluggable transports team. Grad student at Portland State.
 
-  Nima Fatemi, Support
-  Farsi translator; helps answer all the users who contact
-  the support desk.
+  Nima Fatemi, Support, Advocate
+  Farsi team; helps answer all the users who contact
+  the support desk, does training and outreach and works on 
usability.
 
   David Fifield, Developer, Researcher
   Developer and co-inventor of https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] add TODO comments to outdated docs

[sebastian]

commit 6736df4ee656ae0f4564f39c4723321be87bdbc2
Author: Nima Fatemi 
Date:   Tue Oct 28 05:51:08 2014 +

add TODO comments to outdated docs
---
 docs/en/N900.wml|3 +++
 docs/en/bridges.wml |5 +
 docs/en/tor-doc-windows.wml |3 +++
 3 files changed, 11 insertions(+)

diff --git a/docs/en/N900.wml b/docs/en/N900.wml
index 1a23269..c21d36b 100644
--- a/docs/en/N900.wml
+++ b/docs/en/N900.wml
@@ -3,6 +3,9 @@
 # Translation-Priority: 3-low
 
 #include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8"
+
+
+
 
   
 Home » 
diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 3d7b0c9..6da02cc 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -3,6 +3,11 @@
 # Translation-Priority: 1-high
 
 #include "head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8"
+
+
+
+
+
 
   
 Home » 
diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml
index 5764053..de8f07d 100644
--- a/docs/en/tor-doc-windows.wml
+++ b/docs/en/tor-doc-windows.wml
@@ -3,6 +3,9 @@
 # Translation-Priority: 1-high
 
 #include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" 
CHARSET="UTF-8"
+
+
+
 
   
 Home » 

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

[tor-commits] [webwml/staging] apparently apache cannot handle comments on non-empty lines

[sebastian]

commit c61eac7c0a82390118312d890021cb76ccde10ff
Author: Roger Dingledine 
Date:   Wed Oct 22 22:40:13 2014 -0400

apparently apache cannot handle comments on non-empty lines
---
 docs/en/running-a-mirror.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/running-a-mirror.wml b/docs/en/running-a-mirror.wml
index ee903fb..39a3430 100644
--- a/docs/en/running-a-mirror.wml
+++ b/docs/en/running-a-mirror.wml
@@ -75,7 +75,8 @@ rsync -aq --delete rsync://rsync.torproject.org/dist-mirror/ 
/var/www/mirrors/to
 DocumentRoot /var/www/mirrors/torproject.org
 
 
-Options MultiViews Indexes # Be sure to enable the autoindex and 
negotiation modules
+# Be sure to enable the autoindex and negotiation modules
+Options MultiViews Indexes
 DirectoryIndex index
 AllowOverride None
 



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

[tor-commits] [webwml/staging] The short user manual is gone

[sebastian]

commit e49754a4f692dbe2724003bcb98a0dd3218e49f2
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:04:27 2014 +0100

The short user manual is gone

Stop linking to nonexistent binaries and essentially outdated pages.
Inspired by patch to this page from mrphs.
---
 .gitignore|1 -
 docs/en/short-user-manual.wml |   55 -
 docs/en/sidenav.wmi   |4 ---
 docs/torbutton/en/sidenav.wmi |4 ---
 4 files changed, 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8e79d1..4e539a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ docs/pluggable-transports.html.en
 docs/proxychain.html.en
 docs/rpms.html.en
 docs/running-a-mirror.html.en
-docs/short-user-manual.html.en
 docs/signing-keys.html.en
 docs/tor-doc-osx.html.en
 docs/tor-doc-relay.html.en
diff --git a/docs/en/short-user-manual.wml b/docs/en/short-user-manual.wml
deleted file mode 100644
index f1ba1cd..000
--- a/docs/en/short-user-manual.wml
+++ /dev/null
@@ -1,55 +0,0 @@
-## translation metadata
-# Revision: $Revision: 25138 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor Project: FAQ" CHARSET="UTF-8"
-
-  
-Home » 
-Documentation » 
-Short User Manual
-  
-  
-
-Short User Manual
-
-
-The short user manual contains information about how to download
-Tor, how to use it, and what to do if Tor is unable to connect to the
-network. If you can't find the answer to your question in this document,
-email help at rt.torproject.org.
-
-The user manual is available in the following languages:
-
-https://www.torproject.org/dist/manual/short-user-manual_ar.xhtml";>Arabic
-https://www.torproject.org/dist/manual/short-user-manual_zh_CN.xhtml";>Chinese
-https://www.torproject.org/dist/manual/short-user-manual_cs.xhtml";>Czech
-https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml";>Dutch
-   https://torproject.org/dist/manual/short-user-manual_en.xhtml";>English
-https://torproject.org/dist/manual/short-user-manual_fa.xhtml";>Farsi
-https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml";>French
-https://www.torproject.org/dist/manual/short-user-manual_de.xhtml";>German
-https://www.torproject.org/dist/manual/short-user-manual_el.xhtml";>Greek
-https://www.torproject.org/dist/manual/short-user-manual_hu.xhtml";>Hungarian
-https://www.torproject.org/dist/manual/short-user-manual_it.xhtml";>Italian
-https://www.torproject.org/dist/manual/short-user-manual_ja.xhtml";>Japanese
-https://www.torproject.org/dist/manual/short-user-manual_lv.xhtml";>Latvian
-https://www.torproject.org/dist/manual/short-user-manual_nb.xhtml";>Norwegian
-https://www.torproject.org/dist/manual/short-user-manual_pl.xhtml";>Polish
-https://www.torproject.org/dist/manual/short-user-manual_pt_BR.xhtml";>Portuguese
-https://www.torproject.org/dist/manual/short-user-manual_ru.xhtml";>Russian
-https://www.torproject.org/dist/manual/short-user-manual_es.xhtml";>Spanish
-https://www.torproject.org/dist/manual/short-user-manual_sv.xhtml";>Swedish
-https://www.torproject.org/dist/manual/short-user-manual_tr.xhtml";>Turkish
-
-
-  
-  
-  
-#include "side.wmi"
-#include "info.wmi"
-  
-  
-
-
-#include 
diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 8aee928..e0867ed 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -55,10 +55,6 @@
   {'url'  => 'docs/manual',
'txt'  => 'Manuals',
'subelements' => [
-  {   
-   'url'  => 'docs/short-user-manual',
-   'txt'  => 'Short User Manual',
-  }, 
   {'url'  => 'docs/tor-relay-debian',
'txt'  => 'Configuring a Relay manually',
   },
diff --git a/docs/torbutton/en/sidenav.wmi b/docs/torbutton/en/sidenav.wmi
index 0c55730..9b02b91 100644
--- a/docs/torbutton/en/sidenav.wmi
+++ b/docs/torbutton/en/sidenav.wmi
@@ -52,10 +52,6 @@
   {'url'  => 'docs/manual',
'txt'  => 'Manuals',
'subelements' => [
-  {   
-   'url'  => 'docs/short-user-manual',
-   'txt'  => 'Short User Manual',
-  }, 
   {'url'  => 'docs/tor-relay-debian',
'txt'  => 'Configuring a Relay manually',
   },



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

[tor-commits] [webwml/staging] Bump stable version to 0.2.5

[sebastian]

commit 6983edc6dcb37a87408e64d479bfdd108e7ef907
Author: Nick Mathewson 
Date:   Fri Oct 24 09:16:50 2014 -0400

Bump stable version to 0.2.5

Weasel informs me that the website probably doesn't support having
two stable versions, or one stable and no alpha.  So I'm marking
0.2.5.10 as stable _and_ development.  I hope that doesn't explode.
---
 Makefile |4 ++--
 include/versions.wmi |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c22a34a..c4b5245 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.2.4.25
-export DEVTAG=tor-0.2.5.9-rc
+export STABLETAG=tor-0.2.5.10
+export DEVTAG=tor-0.2.5.10
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index f044790..4c8cd2e 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.2.4.25
-0.2.5.9-rc
+0.2.5.10
+0.2.5.10
 
 0.2.4.23
 0.2.4.23



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

[tor-commits] [webwml/staging] switch to some new keys for jake

[sebastian]

commit 6a51711b01f2c20595c1247d1c1d4c2d2abcf49e
Author: Roger Dingledine 
Date:   Thu Oct 23 22:04:33 2014 -0400

switch to some new keys for jake
---
 docs/en/signing-keys.wml |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 5b30e42..d114f61 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -31,7 +31,7 @@
 The Tails team (0xBE2CD9C1) signs the Tails live system
 releases.
 Other developers include Peter Palfrader (0xC82E0039, or its
-subkey 0xE1DEC577) and Jacob Appelbaum (0xE012B42D).
+subkey 0xE1DEC577) and Jacob Appelbaum (0xD255D3F5C868227F).
 
 
 The fingerprints for the keys should be:
@@ -123,7 +123,7 @@
 
 pub   4096R/C5AA446D 2010-07-14
   Key fingerprint = 261C 5FBE 7728 5F88 FB0C  3432 66C8 C2D7 C5AA 446D
-uid  Sebastian Hahn 
+uid  Sebastian Hahn 
 sub   2048R/A2499719 2010-07-14
 sub   2048R/140C961B 2010-07-14
 
@@ -166,6 +166,24 @@
   Key fingerprint = 4A90 646C 0BAE D9D4 56AB  3111 E5B8 1856 D022 0E4B
 uid  Nicolas Vigier (TBB Builds Signing Key) 

 
+ pub   4096R/D255D3F5C868227F 2014-06-27 [expires: 2024-06-24]
+   Key fingerprint = D2C6 7D20 E9C3 6C2A C5FE  74A2 D255 D3F5 C868 227F
+ uid  Jacob Appelbaum 
+ sub   3072R/02636620744301A2 2014-06-27 [expires: 2015-06-27]
+ sub   3072R/1A055A481801A819 2014-06-27 [expires: 2015-06-27]
+
+ pub   4096R/90BC9192B06291B2 2014-06-27 [expires: 2024-06-24]
+   Key fingerprint = 043E 0E69 DD56 BA59 5905  8756 90BC 9192 B062 91B2
+ uid  Jacob Appelbaum 
+ sub   3072R/F78ED60FFE4F141F 2014-06-27 [expires: 2015-06-27]
+ sub   3072R/986D6BCEF02A9C9C 2014-06-27 [expires: 2015-06-27]
+ sub   2048R/89AA6E5D2C6A7F40 2014-10-22 [expires: 2016-10-21]
+
+ pub   4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24]
+   Key fingerprint = D6A9 48CF 297F 7539 30B4  756A FA7F 0E44 D487 F03F
+ uid  Jacob Appelbaum 
+ sub   3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27]
+ sub   3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27]
 
 
   



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

[tor-commits] [webwml/staging] add TODO comments to outdated docs

[sebastian]

commit 6736df4ee656ae0f4564f39c4723321be87bdbc2
Author: Nima Fatemi 
Date:   Tue Oct 28 05:51:08 2014 +

add TODO comments to outdated docs
---
 docs/en/N900.wml|3 +++
 docs/en/bridges.wml |5 +
 docs/en/tor-doc-windows.wml |3 +++
 3 files changed, 11 insertions(+)

diff --git a/docs/en/N900.wml b/docs/en/N900.wml
index 1a23269..c21d36b 100644
--- a/docs/en/N900.wml
+++ b/docs/en/N900.wml
@@ -3,6 +3,9 @@
 # Translation-Priority: 3-low
 
 #include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8"
+
+
+
 
   
 Home » 
diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 3d7b0c9..6da02cc 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -3,6 +3,11 @@
 # Translation-Priority: 1-high
 
 #include "head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8"
+
+
+
+
+
 
   
 Home » 
diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml
index 5764053..de8f07d 100644
--- a/docs/en/tor-doc-windows.wml
+++ b/docs/en/tor-doc-windows.wml
@@ -3,6 +3,9 @@
 # Translation-Priority: 1-high
 
 #include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" 
CHARSET="UTF-8"
+
+
+
 
   
 Home » 



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

[tor-commits] [webwml/staging] remove GUI/vidalia relay guide

[sebastian]

commit 659ce5871f3fe7f4a033d33d79147b30c92d9203
Author: Nima Fatemi 
Date:   Tue Oct 28 01:50:58 2014 +

remove GUI/vidalia relay guide
---
 docs/en/tor-doc-relay.wml |   55 -
 1 file changed, 55 deletions(-)

diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml
index fd025a1..a2069f2 100644
--- a/docs/en/tor-doc-relay.wml
+++ b/docs/en/tor-doc-relay.wml
@@ -54,61 +54,6 @@
 
 
 
-
-Configure Tor with the Vidalia 
Graphical Interface
-
-
-Please note that this graphical approach is only for
-Windows users (and very dedicated OS X users): most fast Tor
-relays are run on Debian or Ubuntu using the system Tor package, and we encourage
-you to go that route too.
-
-
-
-Before you start, verify that your clock and timezone are set
-correctly. If possible, synchronize your clock with public http://en.wikipedia.org/wiki/Network_Time_Protocol";>time
-servers.
-
-
-
-
-
-Right click on the Vidalia icon in your task bar.  Choose Control 
Panel.
-   
-
-Click "Setup Relaying".
-
-
-Choose "Relay Traffic for the Tor network" if you
-want to be a public relay (recommended), or choose "Help
-censored users reach the Tor network" if you want to be a non-public bridge.
-
-
-Enter a nickname for your relay, and enter contact information in
-case we need to contact you about problems.
-
-Leave "Attempt to automatically configure port forwarding" ticked.
-Push the "Test" button to see if it works. If it does work, great.
-If not, see the section on reachability below.
-
-Choose the "Bandwidth Limits" tab.  Select how much bandwidth you want 
to provide for Tor users like yourself.
-
-
-Select the "Exit Policies" tab.  If you want to allow others
-to use your relay for these services, don't change anything.  Un-check
-the services you don't want to allow people to reach from your relay.  If you want to
-be a non-exit relay, un-check all services.
-
-
-Click "Ok".
-
-
-
-
 
 Configure Tor by editing the torrc 
file
 



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

[tor-commits] [webwml/staging] update tails logo

[sebastian]

commit 24f243c17f52839485cb66f204becaabddd96897
Author: Nima Fatemi 
Date:   Tue Oct 28 01:21:37 2014 +

update tails logo
---
 en/index.wml |2 +-
 images/tails_logo.png|  Bin 0 -> 21522 bytes
 projects/en/projects.wml |2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/index.wml b/en/index.wml
index 5ee8d4d..8bacbf2 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -58,7 +58,7 @@
   
 
 https://tails.boum.org/";>
+src="$(IMGROOT)/tails_logo.png" alt="Tails Logo">
 https://tails.boum.org/";>Tails
 Live CD/USB operating system preconfigured to use
 Tor safely.
diff --git a/images/tails_logo.png b/images/tails_logo.png
new file mode 100644
index 000..df5f52e
Binary files /dev/null and b/images/tails_logo.png differ
diff --git a/projects/en/projects.wml b/projects/en/projects.wml
index e3f4604..e4cf2e7 100644
--- a/projects/en/projects.wml
+++ b/projects/en/projects.wml
@@ -110,7 +110,7 @@ href="https://stem.torproject.org/";>Stem
 
 
 https://tails.boum.org/";>
 https://tails.boum.org/";>Tails



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

[tor-commits] [webwml/staging] update internetdefenseleague link to https ftw

[sebastian]

commit b3233898fb46d1438516989ce91bad7560b32ec9
Author: Nima Fatemi 
Date:   Tue Oct 28 01:24:18 2014 +

update internetdefenseleague link to https ftw
---
 include/foot.wmi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/foot.wmi b/include/foot.wmi
index 7f4a9fc..14e5c45 100644
--- a/include/foot.wmi
+++ b/include/foot.wmi
@@ -62,7 +62,7 @@
 
   
 
-http://internetdefenseleague.org/";>
+https://internetdefenseleague.org/";>
 
   
 



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

[tor-commits] [webwml/staging] some meta clean up. making website more html5 friendly

[sebastian]

commit a3d70401d0754206518f56232e9b44df8a2d9f9f
Author: Nima Fatemi 
Date:   Tue Oct 28 01:03:49 2014 +

some meta clean up. making website more html5 friendly
---
 include/head.wmi |   59 +-
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 1d9b327..78e422a 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -6,34 +6,39 @@
 #use "versions.wmi"
 #use "navigation.wmi"
 
-http://www.w3.org/TR/html4/strict.dtd";>
-
-
-  $(TITLE)
-  
-  ">
-  ">
+
+ 
+ 
 
-  # begin WML to generate css/js paths 
-  ">
-  ">
-
-  #
-  
-  
-  
-#  
-  # end WML to generate css/js paths 
-
-  
-  
-  
+   
+   
+   
+   
+   
+ 
+   $(TITLE)
+   
+   
+   ">
+   ">
+ 
+   # begin WML to generate css/js paths 
+   ">
+   ">
+ 
+   #
+   
+   
+   
+ #  
+   # end WML to generate css/js paths 
+ 
 
 
 



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

[tor-commits] [webwml/staging] update tor-doc-windows -- remove bunch of outdated stuff and increased the min bandwidth from 50 to 100KB

[sebastian]

commit 7ea8c1221d1087c4bdefb3fcf2bc6f0821c584ce
Author: Nima Fatemi 
Date:   Tue Oct 28 02:29:18 2014 +

update tor-doc-windows -- remove bunch of outdated stuff and increased the 
min bandwidth from 50 to 100KB
---
 docs/en/tor-doc-windows.wml |   90 +++
 1 file changed, 5 insertions(+), 85 deletions(-)

diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml
index de8f07d..c28f194 100644
--- a/docs/en/tor-doc-windows.wml
+++ b/docs/en/tor-doc-windows.wml
@@ -17,8 +17,8 @@
 
 
 
-Note that these are advanced installation instructions for running Tor. If 
you want to use Tor just for anonymous web browsing, simply download the Tor Browser Bundle and you
+If you want to use Tor just for anonymous web browsing, simply download Tor Browser and you
 are done.
 
 
@@ -27,87 +27,7 @@
 do), read the Configuring a relay
 guide.
 
-
-Freedom House has produced a video on how to install Tor.  You can
-view it at https://media.torproject.org/video/2009-install-and-use-tor.ogv";>How
-to install Tor on Windows.  Know of a better video, or one
-translated into your language?  Let us know!
-
-
-https://media.torproject.org/video/2009-install-and-use-tor.ogv"; 
autobuffer="true" controls="controls">
-
-
-
-
-Step One: Download and Install 
Tor
-
-
-
-The Vidalia Bundles for Windows contain Tor and Vidalia
-(a graphical user interface for Tor).
-They come in different flavors, preconfigured for a convenient setup: The 
Relay bundle is set to forward traffic for other Tor users, the Bridge bundle 
turns your computer into a bridge. Apart from 
that preconfiguration, all Vidalia bundles are the same and can easily be 
reconfigured.
-
-
-
-For anonymous web browsing, please use Tor Browser and not one of the Vidalia bundles. If 
you want to use Tor as a client for other applications, download one of the 
Vidalia bundles and turn it into a client (Settings -> Sharing -> Run as 
a client only).
- 
-
-
-If you have previously installed Tor and Vidalia you can deselect
-whichever components you do not need to install in the dialog
-shown below.
-
-
-
-
-After you have completed the installer, the components
-you selected will automatically be started for you.
-
-
-
-
-Step Two: Configure your applications 
to use Tor
-
-
-
-If you want to use Tor for anonymous web browsing, please use the Tor Browser Bundle. It comes with readily 
configured Tor and a browser patched for better anonymity. To use SOCKS 
directly (for instant messaging, Jabber, IRC, etc),
-you can point your application at Tor (localhost
-port 9050), but see this FAQ
-entry for why this may be dangerous. 
-For applications with HTTP proxy support, but no support for Tor's SOCKS 
proxy, try http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/";>polipo. 
For applications that
-support neither SOCKS nor HTTP, take a look at SocksCap or http://www.freecap.ru/eng/";>FreeCap.  (FreeCap is free
-software; SocksCap is proprietary.)
-
-For information on how to Torify other applications, check out the
-Torify
-HOWTO.
-
-
-
-
-Step Three: Make sure it's 
working
-
-
-
-Check to see that Vidalia is running.  Vidalia uses a small green onion
-to indicate Tor is running or a dark onion with a red "X" when Tor is
-not running. You can start or stop Tor by right-clicking
-on Vidalia's icon in your system tray and selecting "Start" or "Stop"
-from the menu as shown below:
-
-
-
-
-If you have a personal firewall that limits your computer's ability
-to connect to itself, be sure to allow connections from your local
-applications to local port 9050. If your firewall blocks outgoing
-connections, punch a hole so it can connect to at least TCP ports
-80 and 443, and then see this
-FAQ entry.
-
-
+
 If it's still not working, look at this
 FAQ entry for hints.
@@ -120,12 +40,12 @@
 
 
 
-Step Four: Configure it as a 
relay
+Configuring Tor as a relay
 
 
 The Tor network relies on volunteers to donate bandwidth. The more
 people who run relays, the faster the Tor network will be. If you have
-at least 50 kilobytes/s each way, please help out Tor by configuring your
+at least 100 KiloBytes/s each way, please help out Tor by configuring your
 Tor to be a relay too. We have many features that make Tor relays easy
 and convenient, including rate limiting for bandwidth, exit policies so
 you can limit your exposure to abuse complaints, and support for dynamic

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

[tor-commits] [webwml/master] band-aid so the website doesn't look as broken

[sebastian]

commit 5f76c4694e87ff2ebb574fded1526f508e74396e
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:33:44 2014 +0100

band-aid so the website doesn't look as broken
---
 en/index.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/en/index.wml b/en/index.wml
index 8bacbf2..bc5acf5 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -57,7 +57,8 @@
   -->
   
 
-https://tails.boum.org/";>https://tails.boum.org/";>
 https://tails.boum.org/";>Tails
 Live CD/USB operating system preconfigured to use

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

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

[sebastian]

commit c4f7d23bd16e47db0c7b4fca7640556c6c50bb8d
Merge: 7ea8c12 5f76c46
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:49:12 2014 +0100

Merge branch 'master' into staging

 en/index.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

[tor-commits] [webwml/staging] band-aid so the website doesn't look as broken

[sebastian]

commit 5f76c4694e87ff2ebb574fded1526f508e74396e
Author: Sebastian Hahn 
Date:   Tue Oct 28 09:33:44 2014 +0100

band-aid so the website doesn't look as broken
---
 en/index.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/en/index.wml b/en/index.wml
index 8bacbf2..bc5acf5 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -57,7 +57,8 @@
   -->
   
 
-https://tails.boum.org/";>https://tails.boum.org/";>
 https://tails.boum.org/";>Tails
 Live CD/USB operating system preconfigured to use



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

[tor-commits] [webwml/master] a new mirror run

[arma]

commit 82baba6473d9220776c09c08982d8fe0f8d0f437
Author: Roger Dingledine 
Date:   Tue Oct 28 09:40:49 2014 -0400

a new mirror run

i think i'm the only person to do this?
---
 include/mirrors-table.wmi |  272 -
 include/tor-mirrors.csv   |  142 +++
 2 files changed, 241 insertions(+), 173 deletions(-)

diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi
index 3aec4162..ef1835c 100644
--- a/include/mirrors-table.wmi
+++ b/include/mirrors-table.wmi
@@ -18,6 +18,23 @@
  
 
 
+ DE
+
+ Tor Supporter
+
+ Up to date
+
+ - 
+http://tor.hoi-polloi.org/dist/";>http
+http://tor.hoi-polloi.org";>http
+http://tor.hosi-polloi.org/dist/";>https
+http://tor.hossi-polloiorg";>https
+ - 
+ - 
+
+ 
+
+
  NO
 
  MultiNet AS
@@ -35,15 +52,15 @@
  
 
 
- US
+ EE
 
- Tor Supporter
+ CyberSIDE
 
  Up to date
 
  - 
-http://199.175.55.215/dist/";>http
-http://199.175.55.215/";>http
+http://cyberside.net.ee/tor/";>http
+http://cyberside.planet.ee/tor/";>http
  - 
  - 
  - 
@@ -52,15 +69,15 @@
  
 
 
- EE
+ IS
 
- CyberSIDE
+ torproject.is
 
  Up to date
 
  - 
-http://cyberside.net.ee/tor/";>http
-http://cyberside.planet.ee/tor/";>http
+http://www.torproject.is/dist/";>http
+http://www.torproject.is/";>http
  - 
  - 
  - 
@@ -103,17 +120,17 @@
  
 
 
- MX
+ AT
 
- Tor Supporter
+ TechAsk.IT
 
  Up to date
 
  - 
-http://fbnaia.homelinux.net/torproject/dist/";>http
-http://fbnaia.homelinux.net/torproject/";>http
-https://fbnaia.homelinux.net/torproject/dist/";>https
-https://fbnaia.homelinux.net/torproject/";>https
+http://www.unicorncloud.org/public/torproject.org/dist";>http
+http://www.unicorncloud.org/public/torproject.org/";>http
+https://www.unicorncloud.org/public/torproject.org/dist";>https
+https://www.unicorncloud.org/public/torproject.org/";>https
  - 
  - 
 
@@ -171,40 +188,6 @@
  
 
 
- RU
-
- Soviet Anonymous
-
- Up to date
-
-ftp://creep.im/mirrors/tor";>ftp
-http://creep.im/tor/dist/";>http
-http://creep.im/tor";>http
-https://creep.im/tor/dist/";>https
-https://creep.im/tor";>https
-rsync
-rsync
-
- 
-
-
- DE
-
- torservers
-
- Up to date
-
- - 
-http://www.torservers.net/mirrors/torproject.org/dist/";>http
-http://www.torservers.net/mirrors/torproject.org/";>http
-https://www.torservers.net/mirrors/torproject.org/dist/";>https
-https://www.torservers.net/mirrors/torproject.org/";>https
- - 
- - 
-
- 
-
-
  IS
 
  myRL.net
@@ -256,102 +239,119 @@
  
 
 
- US
+ GR
 
- EFF
+ Tor Supporter
 
  Up to date
 
  - 
-https://tor.eff.org/dist/";>http
-https://tor.eff.org";>http
-https://tor.eff.org/dist/";>https
-https://tor.eff.org";>https
+https://tor.void.gr/dist/";>http
+https://tor.void.gr";>http
+https://tor.void.gr/dist/";>https
+https://tor.void.gr";>https
  - 
  - 
 
  
 
 
- GR
+ DE
 
  Tor Supporter
 
  Up to date
 
  - 
-https://tor.void.gr/dist/";>http
-https://tor.void.gr";>http
-https://tor.void.gr/dist/";>https
-https://tor.void.gr";>https
+http://reichster.de/mirrors/torproject.org/dist/";>http
+http://reichster.de/mirrors/torproject.org/";>http
+https://reichster.de/mirrors/torproject.org/dist/";>https
+https://reichster.de/mirrors/torproject.org";>https
  - 
  - 
 
  
 
 
- US
+ FR
 
- Evil Routers
+ Tor Supporter
 
  Up to date
 
  - 
-http://tor1.evilrouters.net/dist/";>http
-http://tor1.evilrouters.net/";>http
- - 
- - 
+http://tor.fr33tux.org/dist/";>http
+http://tor.fr33tux.org";>http
+https://tor.fr33tux.org/dist/";>https
+https://tor.fr33tux.org";>https
  - 
  - 
 
  
 
 
- AT
+ PL
 
- TorNinurtaName
+ Sebastian M. Bobrecki
 
  Up to date
 
  - 
-http://tor.ninurta.name/dist/";>http
-http://tor.ninurta.name/";>http
+http://tor.iv.net.pl/dist/";>http
+http://tor.iv.net.pl";>http
+https://tor.iv.net.pl/dist/";>https
+https://tor.iv.net.pl";>https
  - 
  - 
+
+ 
+
+
+ IS
+
+ Tor Supporter
+
+ Up to date
+
+ - 
+http://ayo.tl/tor/dist/";>http
+http://ayo.tl/tor/";>http
+https://ayo.tl/tor/dist/";>https
+https://ayo.tl/tor/";>https
  - 
  - 
 
  
 
 
- FR
+ NL
 
- Tor Supporter
+ Hackabit.nl
 
  Up to date
 
  - 
-http://tor.fr33tux.org/di

[tor-commits] [webwml/staging] Add some comments to include/blog-recent.wmi

[weasel]

commit bc93fae410a7c23b1803fde8eb99ed48c5630805
Author: Peter Palfrader 
Date:   Tue Oct 28 15:34:36 2014 +0100

Add some comments to include/blog-recent.wmi
---
 include/blog-recent.wmi |9 +
 1 file changed, 9 insertions(+)

diff --git a/include/blog-recent.wmi b/include/blog-recent.wmi
index 25f6974..92bc046 100644
--- a/include/blog-recent.wmi
+++ b/include/blog-recent.wmi
@@ -1,2 +1,11 @@
 
 Recent posts are 
temporarily unavailable
+

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

[tor-commits] [webwml/staging] update .gitignore

[weasel]

commit bd4b46d86cf9f6ef8a0b5ccb1e8b04a0b17d88c0
Author: Peter Palfrader 
Date:   Tue Oct 28 15:31:04 2014 +0100

update .gitignore
---
 .gitignore |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e539a7..1e06ffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,17 +7,20 @@ about/contributors.html.en
 about/corepeople.html.en
 about/financials.html.en
 about/gsoc.html.en
-about/overview.html.en
-about/sponsors.html.en
-about/torusers.html.en
-about/translators.html.en
-about/volunteers.html.en
 about/jobs-browserhacker.html.en
+about/jobs-controller.html.en
 about/jobs-coredev.html.en
+about/jobs-extdev.html.en
+about/jobs-lead-automation.html.en
 about/jobs-pluggabletransport.html.en
 about/jobs-projectcoordinator.html.en
 about/jobs-translatorsupport.html.en
 about/jobs.html.en
+about/overview.html.en
+about/sponsors.html.en
+about/torusers.html.en
+about/translators.html.en
+about/volunteers.html.en
 docs/N900.html.en
 docs/android.html.en
 docs/bridges.html.en
@@ -33,6 +36,7 @@ docs/pluggable-transports.html.en
 docs/proxychain.html.en
 docs/rpms.html.en
 docs/running-a-mirror.html.en
+docs/short-user-manual.html.en
 docs/signing-keys.html.en
 docs/tor-doc-osx.html.en
 docs/tor-doc-relay.html.en
@@ -44,6 +48,8 @@ docs/tor-hidden-service.html.en
 docs/tor-manual-dev.html.en
 docs/tor-manual.html.en
 docs/tor-relay-debian.html.en
+docs/torbutton/torbutton-faq.html.en
+docs/torbutton/torbutton-options.html.en
 docs/trademark-faq.html.en
 docs/verifying-signatures.html.en
 donate/become-sponsor.html.en
@@ -59,8 +65,8 @@ eff/tor-dmca-response.html.en
 eff/tor-legal-faq.html.en
 getinvolved/mirrors.html.en
 getinvolved/open-positions.html.en
-getinvolved/research.html.en
 getinvolved/relays.html.en
+getinvolved/research.html.en
 getinvolved/translation-overview.html.en
 getinvolved/translation.html.en
 getinvolved/tshirt.html.en
@@ -89,4 +95,3 @@ projects/vidalia.html.en
 torbutton/index.html.en
 torbutton/torbutton-faq.html.en
 torbutton/torbutton-options.html.en
-



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

[tor-commits] [stem/master] Better support for multiple hidden services

[atagar]

commit 1294934aa8b2d0bf6bf25ed081ddc54537fad939
Author: Patrick O'Doherty 
Date:   Mon Oct 27 19:56:04 2014 -0700

Better support for multiple hidden services

Adds the following Controller methods for manipulating hidden services.
 * get_hidden_services_conf
 * set_hidden_services_conf
 * create_new_hidden_service
 * delete_hidden_service

Fixes issue #12533 where creating new hidden service would clobber the
configuration for existing services
---
 stem/control.py  |  174 ++
 test/integ/control/controller.py |   73 
 2 files changed, 247 insertions(+)

diff --git a/stem/control.py b/stem/control.py
index ed83a00..1282eb3 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -224,6 +224,12 @@ import StringIO
 import threading
 import time
 
+try:
+  # Added in 2.7
+  from collections import OrderedDict
+except ImportError:
+  from stem.util.ordereddict import OrderedDict
+
 import stem.descriptor.microdescriptor
 import stem.descriptor.reader
 import stem.descriptor.router_status_entry
@@ -1888,6 +1894,174 @@ class Controller(BaseController):
   else:
 raise exc
 
+  def get_hidden_services_conf(self, default = UNDEFINED):
+"""
+This provides a mapping of hidden service directories to their
+attribute's key/value pairs.
+
+{
+  "/var/lib/tor/hidden_service_empty/": {
+"HiddenServicePort": [
+]
+  },
+  "/var/lib/tor/hidden_service_with_two_ports/": {
+"HiddenServiceAuthorizeClient": "stealth a, b",
+"HiddenServicePort": [
+  "8020 127.0.0.1:8020",  # the ports order is kept
+  "8021 127.0.0.1:8021"
+],
+"HiddenServiceVersion": "2"
+  },
+}
+
+:raises:
+  * :class:`stem.ControllerError` if the call fails and we weren't provided
+a default response
+"""
+start_time = time.time()
+
+try:
+  response = self.msg('GETCONF HiddenServiceOptions')
+  stem.response.convert('GETCONF', response)
+  log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' %
+(time.time() - start_time))
+except stem.ControllerError as exc:
+  log.debug('GETCONF HiddenServiceOptions (failed: %s)' % exc)
+  if default != UNDEFINED:
+return default
+  else:
+raise exc
+
+service_dir_map = OrderedDict()
+directory = None
+
+for status_code, divider, content in response.content():
+  if content == 'HiddenServiceOptions':
+continue
+
+  if not "=" in content:
+continue
+
+  k, v = content.split('=', 1)
+
+  if k == 'HiddenServiceDir':
+directory = v
+service_dir_map[directory] = {'HiddenServicePort': []}
+
+  elif k == 'HiddenServicePort':
+service_dir_map[directory]['HiddenServicePort'].append(v)
+
+  else:
+service_dir_map[directory][k] = v
+
+return service_dir_map
+
+  def set_hidden_services_conf(self, conf):
+"""Update all the configured hidden services from a dictionary having
+the same format as the output of get_hidden_services_conf()
+
+:param dict conf: configuration dictionary
+
+:raises:
+  * :class:`stem.ControllerError` if the call fails
+  * :class:`stem.InvalidArguments` if configuration options
+requested was invalid
+  * :class:`stem.InvalidRequest` if the configuration setting is
+impossible or if there's a syntax error in the configuration values
+  * :raises:
+"""
+
+# Convert conf dictionary into a list of ordered config tuples
+hidden_service_options = []
+for directory in conf:
+  hidden_service_options.append(('HiddenServiceDir', directory))
+  for k, v in conf[directory].iteritems():
+if k == 'HiddenServicePort':
+  for port in v:
+hidden_service_options.append(('HiddenServicePort', port))
+else:
+  hidden_service_options.append((k, str(v)))
+self.set_options(hidden_service_options)
+
+  def create_new_hidden_service(self, dirname, virtport, target=None):
+"""Create a new hidden service+port. If the directory is already present, a
+new port will be added. If the port is already present, return False.
+
+:param str dirname: directory name
+:param int virtport: virtual port
+:param str target: optional ipaddr:port target e.g. '127.0.0.1:8080'
+:returns: False if the hidden service and port is already in place
+  True if the creation is successful
+"""
+if stem.util.connection.is_valid_port(virtport):
+  virtport = int(virtport)
+
+else:
+  raise ValueError("%s isn't a valid port number" % virtport)
+
+conf = self.get_hidden_services_conf()
+
+if dirname in conf:
+  ports = conf[dirname]['HiddenServicePort']
+  if target is None:
+if str(virtport) in ports:
+  return False
+
+if "%d 127.0.0.1:%d" % (virtport, virtport) in po

[tor-commits] [stem/master] Revisions for new hidden service methods

[atagar]

commit 2446babb8d03fb58d44ccec7cb333afd472c9395
Author: Damian Johnson 
Date:   Tue Oct 28 10:07:42 2014 -0700

Revisions for new hidden service methods

Lots of changes for the patch from...

  https://trac.torproject.org/projects/tor/ticket/12533

Some that come to mind...

  * Revised pydocs, added header entries, and updated the changelog.

  * Reordered the new methods to be in their own grouping.

  * Renamed get_hidden_services_conf and set_hidden_services_conf to drop 
the
plural.

  * Renamed deleted_hidden_service to remove_hidden_service (since we're not
actually deleting anything).

  * Making create_hidden_service and remove_hidden_service be idempotent,
returning a boolean to indicate if they did anything or not.

  * Dropping hidden services after our integ tests are done.
---
 docs/change_log.rst  |1 +
 stem/control.py  |  357 --
 test/integ/control/controller.py |  106 +--
 3 files changed, 244 insertions(+), 220 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 7297cb9..369806a 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -42,6 +42,7 @@ The following are only available within Stem's `git repository
 
  * **Controller**
 
+  * Added :class:`~stem.control.Controller` methods to more easily work with 
hidden service configurations: 
:func:`~stem.control.Controller.get_hidden_service_conf`, 
:func:`~stem.control.Controller.set_hidden_service_conf`, 
:func:`~stem.control.Controller.create_hidden_service`, and 
:func:`~stem.control.Controller.remove_hidden_service` (feature by federico3 
and patrickod, :trac:`12533`)
   * Added :func:`~stem.control.Controller.get_accounting_stats` to the 
:class:`~stem.control.Controller`
   * Added :func:`~stem.control.Controller.get_effective_rate` to the 
:class:`~stem.control.Controller`
   * Added :func:`~stem.control.BaseController.connection_time` to the 
:class:`~stem.control.BaseController`
diff --git a/stem/control.py b/stem/control.py
index 1282eb3..93fe354 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -95,6 +95,11 @@ If you're fine with allowing your script to raise exceptions 
then this can be mo
 |- reset_conf - reverts configuration options to their default values
 |- set_options - sets or resets the values of multiple configuration 
options
 |
+|- get_hidden_service_conf - provides our hidden service configuration
+|- set_hidden_service_conf - sets our hidden service configuration
+|- create_hidden_service - creates a new hidden service or adds a new port
+|- remove_hidden_service - removes a hidden service or drops a port
+|
 |- add_event_listener - attaches an event listener to be notified of tor 
events
 |- remove_event_listener - removes a listener so it isn't notified of 
further events
 |
@@ -1894,174 +1899,6 @@ class Controller(BaseController):
   else:
 raise exc
 
-  def get_hidden_services_conf(self, default = UNDEFINED):
-"""
-This provides a mapping of hidden service directories to their
-attribute's key/value pairs.
-
-{
-  "/var/lib/tor/hidden_service_empty/": {
-"HiddenServicePort": [
-]
-  },
-  "/var/lib/tor/hidden_service_with_two_ports/": {
-"HiddenServiceAuthorizeClient": "stealth a, b",
-"HiddenServicePort": [
-  "8020 127.0.0.1:8020",  # the ports order is kept
-  "8021 127.0.0.1:8021"
-],
-"HiddenServiceVersion": "2"
-  },
-}
-
-:raises:
-  * :class:`stem.ControllerError` if the call fails and we weren't provided
-a default response
-"""
-start_time = time.time()
-
-try:
-  response = self.msg('GETCONF HiddenServiceOptions')
-  stem.response.convert('GETCONF', response)
-  log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' %
-(time.time() - start_time))
-except stem.ControllerError as exc:
-  log.debug('GETCONF HiddenServiceOptions (failed: %s)' % exc)
-  if default != UNDEFINED:
-return default
-  else:
-raise exc
-
-service_dir_map = OrderedDict()
-directory = None
-
-for status_code, divider, content in response.content():
-  if content == 'HiddenServiceOptions':
-continue
-
-  if not "=" in content:
-continue
-
-  k, v = content.split('=', 1)
-
-  if k == 'HiddenServiceDir':
-directory = v
-service_dir_map[directory] = {'HiddenServicePort': []}
-
-  elif k == 'HiddenServicePort':
-service_dir_map[directory]['HiddenServicePort'].append(v)
-
-  else:
-service_dir_map[directory][k] = v
-
-return service_dir_map
-
-  def set_hidden_services_conf(self, conf):
-"""Update all the configured hidden services from a dictionary having
-the same format as the output of

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/feature10427'

[nickm]

commit 2c884fd8cc0a7a8c42003e10b5033deb5a7d6d99
Merge: 0793ef8 36e7716
Author: Nick Mathewson 
Date:   Tue Oct 28 14:03:40 2014 -0400

Merge remote-tracking branch 'rl1987/feature10427'

 changes/ticket10427 |4 
 src/or/router.c |   21 +
 2 files changed, 25 insertions(+)

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

[tor-commits] [tor/master] Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.

[nickm]

commit f1ebe6bda4f541a54648d02e2d51fc9073c3786d
Author: rl1987 
Date:   Sun Oct 26 20:56:15 2014 +0200

Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with 
BadExit flag.
---
 changes/bug13066|4 
 src/or/or.h |8 
 src/or/routerlist.c |2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/changes/bug13066 b/changes/bug13066
new file mode 100644
index 000..388c999
--- /dev/null
+++ b/changes/bug13066
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+- Fix node selection logic in smartlist_choose_node_by_bandwidth()
+  so that onion routers with BadExit flag are not considered to be
+  worthy candidates. Fixes issue 13066.
diff --git a/src/or/or.h b/src/or/or.h
index 115b92d..2c79c13 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3228,6 +3228,14 @@ static const or_circuit_t *CONST_TO_OR_CIRCUIT(const 
circuit_t *);
 static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *);
 static const origin_circuit_t *CONST_TO_ORIGIN_CIRCUIT(const circuit_t *);
 
+/** Return 1 iff node has Exit flag and no BadExit flag.
+ * Otherwise, return 0.
+ */
+static INLINE int node_is_good_exit(const node_t *node)
+{
+  return node->is_exit && ! node->is_bad_exit;
+}
+
 static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x)
 {
   tor_assert(x->magic == OR_CIRCUIT_MAGIC);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 4d117cb..642b971 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2202,7 +2202,7 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
 uint32_t this_bw = 0;
 i = node_sl_idx;
 
-is_exit = node->is_exit;
+is_exit = node_is_good_exit(node);
 is_guard = node->is_possible_guard;
 if (node->rs) {
   if (node->rs->has_bandwidth) {

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

[tor-commits] [translation-tools/master] Remove tsum resource from config file, and cronjob

[colin]

commit e77fa85ead12344b3c6fdce94f4e221caec2de81
Author: Colin Childs 
Date:   Tue Oct 28 13:09:16 2014 -0500

Remove tsum resource from config file, and cronjob
---
 config  |2 +-
 crontab |3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config b/config
index 501e818..d768684 100644
--- a/config
+++ b/config
@@ -8,7 +8,7 @@ TRANSLATION_REPO=/srv/translation.torproject.org/translations/
 TX=/usr/bin/tx
 
 PROJECTS="bridgedb bridgedb_completed gettor gettor_completed
-tsum tsum_completed torcheck torcheck_completed whisperback 
+torcheck torcheck_completed whisperback 
 whisperback_completed https_everywhere https_everywhere_completed 
 liveusb-creator liveusb-creator_completed tails-persistence-setup
 tails-persistence-setup_completed tails-greeter tails-greeter_completed
diff --git a/crontab b/crontab
index f87549f..c8f4d46 100644
--- a/crontab
+++ b/crontab
@@ -1,6 +1,3 @@
 MAILTO=sebast...@torproject.org
 15,45 * * * * /srv/translation.torproject.org/tools/update_translations
-#MAILTO=r...@torproject.org
-MAILTO=co...@torproject.org
-10,40 * * * * /srv/translation.torproject.org/tools/mail_tsum_completed
 

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

[tor-commits] [tor/master] Congratulate relay operator when OR is first started

[nickm]

commit 36e771628eb77f9eb4101517b761c8dc652ff037
Author: rl1987 
Date:   Sun Oct 26 21:51:35 2014 +0200

Congratulate relay operator when OR is first started

When Tor first generates identity keypair, emit a log message that
thanks for their participation and points to new Tor relay lifecycle
document.
---
 changes/ticket10427 |4 
 src/or/router.c |   21 +
 2 files changed, 25 insertions(+)

diff --git a/changes/ticket10427 b/changes/ticket10427
new file mode 100644
index 000..66af284
--- /dev/null
+++ b/changes/ticket10427
@@ -0,0 +1,4 @@
+  o Minor features:
+- When identity keypair is generated for first time, log a 
+  congratulatory message that points to new relay lifecycle
+  document. Implements feature 10427.
diff --git a/src/or/router.c b/src/or/router.c
index bbbf9c4..b202554 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -381,6 +381,26 @@ rotate_onion_key(void)
   tor_free(fname_prev);
 }
 
+/** Log greeting message that points to new relay lifecycle document the
+ * first time this function has been called.
+ */
+static void
+log_new_relay_greeting(void)
+{
+  static int already_logged = 0;
+
+  if (already_logged)
+return;
+
+  tor_log(LOG_NOTICE, LD_GENERAL, "You are running a new relay. "
+ "Thanks for helping the Tor network! If you wish to know "
+ "what will happen in the upcoming weeks regarding its usage, "
+ "have a look at https://blog.torproject.org/blog/lifecycle-of";
+ "-a-new-relay");
+
+  already_logged = 1;
+}
+
 /** Try to read an RSA key from fname.  If fname doesn't exist
  * and generate is true, create a new RSA key and save it in
  * fname.  Return the read/created key, or NULL on error.  Log all
@@ -425,6 +445,7 @@ init_key_from_file(const char *fname, int generate, int 
severity)
   goto error;
 }
 log_info(LD_GENERAL, "Generated key seems valid");
+log_new_relay_greeting();
 if (crypto_pk_write_private_key_to_filename(prkey, fname)) {
   tor_log(severity, LD_FS,
   "Couldn't write generated key to \"%s\".", fname);



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

[tor-commits] [tor/master] Adding changes file for 9708.

[nickm]

commit fd83bc1d417990a06407b56d4c9fed9bc94f878b
Author: rl1987 
Date:   Sun Oct 26 19:48:22 2014 +0200

Adding changes file for 9708.
---
 changes/ticket9708 |6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/ticket9708 b/changes/ticket9708
new file mode 100644
index 000..91197f2
--- /dev/null
+++ b/changes/ticket9708
@@ -0,0 +1,6 @@
+  o Documentation:
+- Add doc/TUNING document with tips for handling large numbers of TCP
+  connections when running busy Tor relay. Update warning message to
+  point to this file when running out of sockets operating system
+  is allowing to use simultaneously. Resolves ticket 9708.
+

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

[tor-commits] [tor/master] Updating message that warns about running out of sockets we can use.

[nickm]

commit 14d59fdc1009dcbcbf6e30c9eee7cd68fbd7
Author: rl1987 
Date:   Sun Oct 26 16:45:15 2014 +0200

Updating message that warns about running out of sockets we can use.
---
 src/or/connection.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 5c1b6d9..a2aad6f 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -894,9 +894,9 @@ create_unix_sockaddr(const char *listenaddress, char 
**readable_address,
 }
 #endif /* HAVE_SYS_UN_H */
 
-/** Warn that an accept or a connect has failed because we're running up
- * against our ulimit.  Rate-limit these warnings so that we don't spam
- * the log. */
+/** Warn that an accept or a connect has failed because we're running out of
+ * TCP sockets we can use on current system.  Rate-limit these warnings so
+ * that we don't spam the log. */
 static void
 warn_too_many_conns(void)
 {
@@ -906,7 +906,7 @@ warn_too_many_conns(void)
   if ((m = rate_limit_log(&last_warned, approx_time( {
 int n_conns = get_n_open_sockets();
 log_warn(LD_NET,"Failing because we have %d connections already. Please "
- "raise your ulimit -n.%s", n_conns, m);
+ "read doc/TUNING for guidance.%s", n_conns, m);
 tor_free(m);
 control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
  n_conns);



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

[tor-commits] [tor/master] Initial version of doc/TUNING.

[nickm]

commit 6317146b4d96c403773eb72fc293352ad3c47487
Author: rl1987 
Date:   Sun Oct 26 19:37:48 2014 +0200

Initial version of doc/TUNING.
---
 doc/TUNING |   47 +++
 1 file changed, 47 insertions(+)

diff --git a/doc/TUNING b/doc/TUNING
new file mode 100644
index 000..a4bf386
--- /dev/null
+++ b/doc/TUNING
@@ -0,0 +1,47 @@
+Most operating systems limit an amount of TCP sockets that can be used 
+simultaneously. It is possible for a busy Tor relay to run into these
+limits, thus being unable to fully utilize the bandwidth resources it 
+has at its disposal. Following system-specific tips might be helpful
+to alleviate the aforementioned problem.
+
+Linux
+-
+
+Use 'ulimit -n' to raise an allowed number of file descriptors to be 
+opened on your host at the same time.
+
+FreeBSD
+---
+
+Tune the followind sysctl(8) variables:
+ * kern.maxfiles - maximum allowed file descriptors (for entire system)
+ * kern.maxfilesperproc - maximum file descriptors one process is allowed
+   to use
+ * kern.ipc.maxsockets - overall maximum numbers of sockets for entire 
+   system
+ * kern.ipc.somaxconn - size of listen queue for incoming TCP connections
+   for entire system
+
+See also:
+ * https://www.freebsd.org/doc/handbook/configtuning-kernel-limits.html
+ * https://wiki.freebsd.org/NetworkPerformanceTuning
+
+Mac OS X
+
+
+Since Mac OS X is BSD-based system, most of the above hold for OS X as well.
+However, launchd(8) is known to modify kern.maxfiles and kern.maxfilesperproc
+when it launches tor service (see launchd.plist(5) manpage). Also, 
+kern.ipc.maxsockets is determined dynamically by the system and thus is 
+read-only on OS X.
+
+Disclaimer
+--
+
+Do note that this document is a draft and above information may be
+technically incorrect and/or incomplete. If so, please open a ticket
+on https://trac.torproject.org or post to tor-relays mailing list.
+
+Are you running a busy Tor relay? Let us know how you are solving
+the out-of-sockets problem on your system.
+



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

[tor-commits] [tor/master] Add another year to our copyright dates.

[nickm]

commit fcdcb377a4de84a50d771cdd8bed61890d9dfc4e
Author: Nick Mathewson 
Date:   Tue Oct 28 15:28:14 2014 -0400

Add another year to our copyright dates.

Because in 95 years, we or our successors will surely care about
enforcing the BSD license terms on this code.  Right?
---
 LICENSE|2 +-
 acinclude.m4   |2 +-
 configure.ac   |2 +-
 src/common/address.c   |2 +-
 src/common/address.h   |2 +-
 src/common/aes.c   |2 +-
 src/common/aes.h   |2 +-
 src/common/backtrace.c |2 +-
 src/common/backtrace.h |2 +-
 src/common/compat.c|2 +-
 src/common/compat.h|2 +-
 src/common/compat_libevent.c   |2 +-
 src/common/compat_libevent.h   |2 +-
 src/common/container.c |2 +-
 src/common/container.h |2 +-
 src/common/crypto.c|2 +-
 src/common/crypto.h|2 +-
 src/common/crypto_curve25519.c |2 +-
 src/common/crypto_curve25519.h |2 +-
 src/common/crypto_ed25519.c|2 +-
 src/common/crypto_ed25519.h|2 +-
 src/common/crypto_format.c |2 +-
 src/common/crypto_s2k.c|2 +-
 src/common/crypto_s2k.h|2 +-
 src/common/di_ops.c|2 +-
 src/common/di_ops.h|2 +-
 src/common/log.c   |2 +-
 src/common/memarea.c   |2 +-
 src/common/memarea.h   |2 +-
 src/common/mempool.c   |2 +-
 src/common/mempool.h   |2 +-
 src/common/procmon.c   |2 +-
 src/common/procmon.h   |2 +-
 src/common/sandbox.c   |2 +-
 src/common/sandbox.h   |2 +-
 src/common/testsupport.h   |2 +-
 src/common/torgzip.c   |2 +-
 src/common/torgzip.h   |2 +-
 src/common/torint.h|2 +-
 src/common/torlog.h|2 +-
 src/common/tortls.c|2 +-
 src/common/tortls.h|2 +-
 src/common/util.c  |2 +-
 src/common/util.h  |2 +-
 src/common/util_process.c  |2 +-
 src/common/util_process.h  |2 +-
 src/ext/csiphash.c |2 +-
 src/ext/ht.h   |2 +-
 src/or/addressmap.c|2 +-
 src/or/addressmap.h|2 +-
 src/or/buffers.c   |2 +-
 src/or/buffers.h   |2 +-
 src/or/channel.c   |2 +-
 src/or/channel.h   |2 +-
 src/or/channeltls.c|2 +-
 src/or/channeltls.h|2 +-
 src/or/circpathbias.c  |2 +-
 src/or/circpathbias.h  |2 +-
 src/or/circuitbuild.c  |2 +-
 src/or/circuitbuild.h  |2 +-
 src/or/circuitlist.c   |2 +-
 src/or/circuitlist.h   |2 +-
 src/or/circuitmux.c|2 +-
 src/or/circuitmux.h|2 +-
 src/or/circuitmux_ewma.c   |2 +-
 src/or/circuitmux_ewma.h   |2 +-
 src/or/circuitstats.c  |2 +-
 src/or/circuitstats.h  |2 +-
 src/or/circuituse.c|2 +-
 src/or/circuituse.h|2 +-
 src/or/command.c   |2 +-
 src/or/command.h   |2 +-
 src/or/config.c|4 ++--
 src/or/config.h|2 +-
 src/or/confparse.c |2 +-
 src/or/confparse.h |2 +-
 src/or/connection.c|2 +-
 src/or/connection.h|2 +-
 src/or/connection_edge.c   |2 +-
 src/or/connection_edge.h   |2 +-
 src/or/connection_or.c |2 +-
 src/o

[tor-commits] [tor-browser-bundle/master] Bug 12903: Integrate obfs4proxy into Tor Browser.

[mikeperry]

commit 0a916fb562dcc744e4f3ce7b491669bcfd41b64c
Merge: 3fd3351 bb6389f
Author: Georg Koppen 
Date:   Mon Oct 13 15:27:00 2014 +

Bug 12903: Integrate obfs4proxy into Tor Browser.

We start shipping obfs4proxy in Tor Browser nightlies and the alpha
series.

 .../Docs/Licenses/PluggableTransports/LICENSE  |   77 +---
 Bundle-Data/PTConfigs/bridge_prefs.js  |4 +
 .../PTConfigs/linux/torrc-defaults-appendix|6 +-
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix  |5 +-
 .../PTConfigs/windows/torrc-defaults-appendix  |5 +-
 .../linux/gitian-pluggable-transports.yml  |   54 ++
 .../mac/gitian-pluggable-transports.yml|   54 ++
 .../windows/gitian-pluggable-transports.yml|   54 ++
 gitian/fetch-inputs.sh |   17 -
 gitian/gpg/obfs4proxy.gpg  |  Bin 0 -> 34128 bytes
 gitian/mkbundle-linux.sh   |3 +-
 gitian/mkbundle-mac.sh |3 +-
 gitian/mkbundle-windows.sh |3 +-
 gitian/verify-tags.sh  |5 +-
 gitian/versions.alpha  |9 +++
 gitian/versions.nightly|9 +++
 16 files changed, 291 insertions(+), 17 deletions(-)

diff --cc gitian/versions.nightly
index 9dc6f3f,3867629..5bd9d63
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@@ -95,7 -100,8 +100,9 @@@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505a
  
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
  PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
  GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff
 +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+ GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
+ GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
  
  ## Non-git package URLs
  OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}



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

[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'gk/bug_12903_squashed_v3'

[mikeperry]

commit 104bd981bfb47563d3eb8c28069a1d87deea03ed
Merge: 875f231 0a916fb
Author: Mike Perry 
Date:   Tue Oct 28 15:40:50 2014 -0700

Merge remote-tracking branch 'gk/bug_12903_squashed_v3'

 .../Docs/Licenses/PluggableTransports/LICENSE  |   77 +---
 Bundle-Data/PTConfigs/bridge_prefs.js  |4 +
 .../PTConfigs/linux/torrc-defaults-appendix|6 +-
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix  |5 +-
 .../PTConfigs/windows/torrc-defaults-appendix  |5 +-
 .../linux/gitian-pluggable-transports.yml  |   54 ++
 .../mac/gitian-pluggable-transports.yml|   54 ++
 .../windows/gitian-pluggable-transports.yml|   54 ++
 gitian/fetch-inputs.sh |   17 -
 gitian/gpg/obfs4proxy.gpg  |  Bin 0 -> 34128 bytes
 gitian/mkbundle-linux.sh   |3 +-
 gitian/mkbundle-mac.sh |3 +-
 gitian/mkbundle-windows.sh |3 +-
 gitian/verify-tags.sh  |5 +-
 gitian/versions.alpha  |9 +++
 gitian/versions.nightly|9 +++
 16 files changed, 291 insertions(+), 17 deletions(-)




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

[tor-commits] [tor-browser-bundle/master] Bug 12903: Integrate obfs4proxy into Tor Browser.

[mikeperry]

commit bb6389fbe7aa9539c4dce2aba0659e61ae8a376a
Author: Georg Koppen 
Date:   Mon Oct 13 11:42:46 2014 +

Bug 12903: Integrate obfs4proxy into Tor Browser.

We start shipping obfs4proxy in Tor Browser nightlies and the alpha
series.
---
 .../Docs/Licenses/PluggableTransports/LICENSE  |   77 +---
 Bundle-Data/PTConfigs/bridge_prefs.js  |4 +
 .../PTConfigs/linux/torrc-defaults-appendix|6 +-
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix  |5 +-
 .../PTConfigs/windows/torrc-defaults-appendix  |5 +-
 .../linux/gitian-pluggable-transports.yml  |   54 ++
 .../mac/gitian-pluggable-transports.yml|   54 ++
 .../windows/gitian-pluggable-transports.yml|   54 ++
 gitian/fetch-inputs.sh |   17 -
 gitian/gpg/obfs4proxy.gpg  |  Bin 0 -> 34128 bytes
 gitian/mkbundle-linux.sh   |3 +-
 gitian/mkbundle-mac.sh |3 +-
 gitian/mkbundle-windows.sh |3 +-
 gitian/verify-tags.sh  |5 +-
 gitian/versions.alpha  |9 +++
 gitian/versions.nightly|9 +++
 16 files changed, 291 insertions(+), 17 deletions(-)

diff --git a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE 
b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
index 749986b..c6efd2c 100644
--- a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
+++ b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
@@ -13,15 +13,6 @@ file LICENSE.PYTHON.
 
 ===
 
-Go
-
-Some pluggable transports are written in Go and the binary packages include
-parts of the Go runtime library. A copy of the Go license (which itself
-includes the licenses of some of Go's components) is included in the file
-LICENSE.GO.
-
-===
-
 OpenSSL
 
 (From http://openssl.org/source/license.html.)
@@ -447,3 +438,71 @@ To the extent possible under law, the authors have 
dedicated all
 copyright and related and neighboring rights to this software to the
 public domain worldwide. This software is distributed without any
 warranty. See LICENSE.CC0.
+
+===
+
+obfs4
+
+Copyright (c) 2014, Yawning Angel 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+go.net
+
+Copyright 2009 The Go Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+
+For details about the Go License, please see LICENSE.GO.
+
+===
+
+go.crypto
+
+Copyright 2009 The Go Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+
+For details about the Go License, please see LICENSE.GO.
+
+===
+
+agl/ed25519
+
+Copyright 2013 The Go Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+
+For details about the Go License, please see LICENSE.GO.
+
+===
+
+dchest/siphash
+
+To the extent possible under law, the authors have dedicated all
+copyright and related and neighboring rights to this software 

[tor-commits] [tor-browser-bundle/master] Update versions file for 4.5-alpha.

[mikeperry]

commit 329adc09efb6e7f7bcf36297313ddeaad979287f
Author: Mike Perry 
Date:   Tue Oct 28 15:51:00 2014 -0700

Update versions file for 4.5-alpha.
---
 gitian/versions.alpha |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 0912b5d..0fb2bd0 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -1,35 +1,32 @@
-TORBROWSER_VERSION=4.0-alpha-3
+TORBROWSER_VERSION=4.5-alpha-1
 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
 BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=24.8.1esr
+FIREFOX_VERSION=31.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1
-TOR_TAG=tor-0.2.5.8-rc
-TORLAUNCHER_TAG=25bc6349f5f1e43c7d383883e6d6822b8edb41bc # 0.2.7.0
-TORBUTTON_TAG=1.6.12.3
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3
+TOR_TAG=tor-0.2.5.10
+TORLAUNCHER_TAG=0.2.7.0.1
+TORBUTTON_TAG=1.7.0.1
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
-MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0
+MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ???
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
-LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0
+LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix
 FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
 MEEK_TAG=0.11
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
-GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
-GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
-OBFS4_TAG=obfs4proxy-0.0.3
 
 GITIAN_TAG=tor-browser-builder-3.x-7
 
@@ -38,7 +35,7 @@ GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
-GCC_VER=4.8.3
+GCC_VER=4.9.1
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -56,7 +53,7 @@ GO_VER=1.3.3
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
@@ -86,7 +83,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33
+NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a
 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
@@ -99,6 +96,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff
+GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
 GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
 GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
 

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

[tor-commits] [tor-browser-bundle/master] Switch nightlies and alpha to new Tor Browser branch.

[mikeperry]

commit 42d1b7373a8dbb9f6359c1c1a3589af392878d7b
Author: Mike Perry 
Date:   Tue Oct 28 16:15:39 2014 -0700

Switch nightlies and alpha to new Tor Browser branch.
---
 gitian/versions.alpha   |2 +-
 gitian/versions.nightly |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 0fb2bd0..6c49137 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1
 TOR_TAG=tor-0.2.5.10
 TORLAUNCHER_TAG=0.2.7.0.1
 TORBUTTON_TAG=1.7.0.1
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index dc545ae..e6ea2a1 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=default
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1
 TOR_TAG=master
 TORLAUNCHER_TAG=master
 TORBUTTON_TAG=master

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

[tor-commits] [tor-browser-bundle/master] Bug 8405: Add Tor patch for domain isolation.

[mikeperry]

commit 1eeb621e9a20afc065518f34e6a6c87c35109fa3
Author: Mike Perry 
Date:   Tue Oct 28 17:50:47 2014 -0700

Bug 8405: Add Tor patch for domain isolation.

Also clean up our patch application.
---
 gitian/descriptors/linux/gitian-tor.yml   |   20 ++-
 gitian/descriptors/mac/gitian-tor.yml |   20 ++-
 gitian/descriptors/windows/gitian-tor.yml |   20 ++-
 gitian/patches/bug8405.patch  |   84 +
 4 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml 
b/gitian/descriptors/linux/gitian-tor.yml
index e678203..68a5bae 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -27,6 +27,7 @@ files:
 - "bug9665.patch"
 - "bug8402.patch"
 - "bug8402-master.patch"
+- "bug8405.patch"
 - "dzip.sh"
 - "openssl-linux32-utils.zip"
 - "openssl-linux64-utils.zip"
@@ -82,23 +83,12 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.5" ];
   then
-git am ~/build/bug10297.patch
-  fi
-  if [ $BUILD_PT_BUNDLES ]; then
-if [ ${TOR_TAG::9} == "tor-0.2.4" ];
-then
-  git am ~/build/bug5018.patch
-  git am ~/build/bug11069.patch
-  git am ~/build/bug11156.patch
-  git am ~/build/bug9665.patch
-  git am ~/build/bug11200.patch
-  git am ~/build/bug8402.patch
-elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
-then
+  git am ~/build/bug8405.patch
   git am ~/build/bug8402-master.patch
-fi
+  else # 0.2.6 and master
+  git am ~/build/bug8405.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml 
b/gitian/descriptors/mac/gitian-tor.yml
index 6022c0b..36b5b0f 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -23,6 +23,7 @@ files:
 - "bug9665.patch"
 - "bug8402.patch"
 - "bug8402-master.patch"
+- "bug8405.patch"
 - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
 - 
"multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
 - "dzip.sh"
@@ -60,23 +61,12 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.5" ];
   then
-git am ~/build/bug10297.patch
-  fi
-  if [ $BUILD_PT_BUNDLES ]; then
-if [ ${TOR_TAG::9} == "tor-0.2.4" ];
-then
-  git am ~/build/bug5018.patch
-  git am ~/build/bug11069.patch
-  git am ~/build/bug11156.patch
-  git am ~/build/bug9665.patch
-  git am ~/build/bug11200.patch
-  git am ~/build/bug8402.patch
-elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
-then
+  git am ~/build/bug8405.patch
   git am ~/build/bug8402-master.patch
-fi
+  else # 0.2.6 and master
+  git am ~/build/bug8405.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml 
b/gitian/descriptors/windows/gitian-tor.yml
index 0ac603c..6be93b5 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -23,6 +23,7 @@ files:
 - "bug9665.patch"
 - "bug8402.patch"
 - "bug8402-master.patch"
+- "bug8405.patch"
 - "binutils.tar.bz2"
 - "dzip.sh"
 - "mingw-w64-win32-utils.zip"
@@ -60,23 +61,12 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.5" ];
   then
-git am ~/build/bug10297.patch
-  fi
-  if [ $BUILD_PT_BUNDLES ]; then
-if [ ${TOR_TAG::9} == "tor-0.2.4" ];
-then
-  git am ~/build/bug5018.patch
-  git am ~/build/bug11069.patch
-  git am ~/build/bug11156.patch
-  git am ~/build/bug9665.patch
-  git am ~/build/bug11200.patch
-  git am ~/build/bug8402.patch
-elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
-then
+  git am ~/build/bug8405.patch
   git am ~/build/bug8402-master.patch
-fi
+  else # 0.2.6 and master
+  git am ~/build/bug8405.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/patches/bug8405.patch b/gitian/patches/bug8405.patch
new file mode 100644
index 000..3c40632
--- /dev/null
+++ b/gitian/patches/bug8405.patch
@@ -0,0 +1,84 @@
+From a298c77f7eba232154ff08ca1119b05ccd9eee9e Mon Sep 17 00:00:00 2001
+From: Arthur Edelstein 
+Date: Tue, 15 Jul 2014 21:27:59 -0700
+Subject: [PATCH] Bug #8405: Report SOCKS username/password in CIRC status
+ events
+
+Introduces two new circuit status name-value parameters: SOCKS_USERNAME
+and SOCKS_PASSWORD. Values are enclosing in quotes and unusual characters
+are escaped.
+

[tor-commits] [tor-browser-bundle/master] Remove old patches.

[mikeperry]

commit af7bd8eba8f6c442a3a628c0a957ec089409a464
Author: Mike Perry 
Date:   Tue Oct 28 17:54:15 2014 -0700

Remove old patches.
---
 gitian/patches/bug10297.patch|   55 
 gitian/patches/bug11069.patch|  209 --
 gitian/patches/bug11156.patch|  275 ---
 gitian/patches/bug11200-hang-0.2.5.patch |   81 --
 gitian/patches/bug11200.patch|   39 ---
 gitian/patches/bug5018.patch |  225 ---
 gitian/patches/bug8402.patch |  437 --
 gitian/patches/bug9665.patch |  108 
 8 files changed, 1429 deletions(-)

diff --git a/gitian/patches/bug10297.patch b/gitian/patches/bug10297.patch
deleted file mode 100644
index 58dfdc2..000
--- a/gitian/patches/bug10297.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ad47e1a52072c2a4528e421a6a3bf9c7029f4501 Mon Sep 17 00:00:00 2001
-From: David Fifield 
-Date: Thu, 5 Dec 2013 04:56:28 +
-Subject: [PATCH] Set CREATE_NO_WINDOW in tor_spawn_background.
-
-This flag prevents the creation of a console window popup on Windows. We
-need it for pluggable transport executables--otherwise you get blank
-console windows when you launch the 3.x browser bundle with transports
-enabled.
-
-http://msdn.microsoft.com/en-us/library/ms684863.aspx#CREATE_NO_WINDOW
-
-The browser bundles that used Vidalia used to set this flag when
-launching tor itself; it was apparently inherited by the pluggable
-transports launched by tor. In the 3.x bundles, tor is launched by some
-JavaScript code, which doesn't have the ability to set CREATE_NO_WINDOW.
-tor itself is now being compiled with the -mwindows option, so that it
-is a GUI application, not a console application, and doesn't show a
-console window in any case. This workaround doesn't work for pluggable
-transports, because they need to be able to write control messages to
-stdout.
-
-https://trac.torproject.org/projects/tor/ticket/9444#comment:30

- changes/bug10297  |4 
- src/common/util.c |2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- create mode 100644 changes/bug10297
-
-diff --git a/changes/bug10297 b/changes/bug10297
-new file mode 100644
-index 000..4cdd80f
 /dev/null
-+++ b/changes/bug10297
-@@ -0,0 +1,4 @@
-+  o Minor features:
-+- Spawn background processes using the CREATE_NO_WINDOW flag on
-+  Windows, in order to prevent a console window from appearing.
-+  Resolves ticket 10297.
-diff --git a/src/common/util.c b/src/common/util.c
-index 5eb0f9a..252f6af 100644
 a/src/common/util.c
-+++ b/src/common/util.c
-@@ -3685,7 +3685,7 @@ tor_spawn_background(const char *const filename, const 
char **argv,
-  TRUE,  // handles are inherited
-   /*(TODO: set CREATE_NEW CONSOLE/PROCESS_GROUP to make GetExitCodeProcess()
-* work?) */
-- 0, // creation flags
-+ CREATE_NO_WINDOW, // creation flags
-  (env==NULL) ? NULL : env->windows_environment_block,
-  NULL,  // use parent's current directory
-  &siStartInfo,  // STARTUPINFO pointer
--- 
-1.7.9.5
-
diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch
deleted file mode 100644
index b6032e9..000
--- a/gitian/patches/bug11069.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 67c70b2566fc9bef4527fb8a0c24ce7d8c4d0647 Mon Sep 17 00:00:00 2001
-From: George Kadianakis 
-Date: Mon, 10 Mar 2014 22:52:07 +
-Subject: [PATCH] Throw control port warning if we failed to connect to all our
- bridges.
-
-Conflicts:
-   src/or/connection.c
-   src/or/control.c
-   src/or/control.h
-   src/test/test_extorport.c

- changes/bug11069   |  4 
- src/or/connection.c| 25 +
- src/or/connection.h|  2 ++
- src/or/connection_or.c |  8 +---
- src/or/control.c   | 13 -
- src/or/control.h   |  3 ++-
- src/or/entrynodes.c| 21 -
- src/or/entrynodes.h|  1 -
- 8 files changed, 46 insertions(+), 31 deletions(-)
- create mode 100644 changes/bug11069
-
-diff --git a/changes/bug11069 b/changes/bug11069
-new file mode 100644
-index 000..5aa3085
 /dev/null
-+++ b/changes/bug11069
-@@ -0,0 +1,4 @@
-+  o Minor bugfixes (clients):
-+- Fix tor so that it raises a control port warning when we fail to
-+  connect to all of our bridges. Fixes bug 11069; bugfix on
-+  tor-0.2.1.2-alpha.
-diff --git a/src/or/connection.c b/src/or/connection.c
-index 4f74a1d..ba28d81 100644
 a/src/or/connection.c
-+++ b/src/or/connection.c
-@@ -3846,6 +3846,31 @@ connection_get_by_type_purpose(int type, int purpose)
-   return NULL;
- }
- 
-+/** Return 1 if there are any active OR connections apart from
-+ * this_conn.
-+ *
-+ * We use this to guess if we should tell the controller that we
-+ * didn't manage to connect to any of our bridges. */
-+int
-+any_

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

[translation]

commit 71e57897657b02050344e46c0fc8f7d66f078618
Author: Translation commit bot 
Date:   Wed Oct 29 01:45:47 2014 +

Update translations for torbutton-torbuttondtd
---
 tr/torbutton.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index b7eee20..f2f1762 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -121,14 +121,14 @@
 
 
 
-
+
 
 
 
-
-
-
-
+
+
+
+
 
 
 

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

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

[translation]

commit b236a4398ca13e8bcb40c1ba7ef4b351316d973d
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:17 2014 +

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

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 9a22f76..b854b0e 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2014-10-17 11:00+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgid ""
 msgstr "Tor Projesi kendini çevrimiçi gizliliğin ve mahremiyetin 
araştırılmasına, geliştirilmesine ve eğitimine adamış ABD 501(c)(3) kar 
amacı gütmeyen bir kuruluştur."
 
 msgid "Learn More »"
-msgstr "Daha fazlasını öğrenin »"
+msgstr "Daha Fazlasını Öğrenin »"
 
 msgid "Go"
 msgstr "Git"
@@ -83,10 +83,10 @@ msgid "Short User Manual"
 msgstr "Kısa Kullanıcı Kılavuzu"
 
 msgid "Donate to Support Tor"
-msgstr "Tor'u desteklemek için bağış yapın"
+msgstr "Tor'u Desteklemek için Bağış Yapın"
 
 msgid "Tor Q&A Site"
-msgstr "Tor Soru-Yanıt Sitesi"
+msgstr "Tor Soru-Cevap Sitesi"
 
 msgid "Volunteer"
 msgstr "Gönüllü"

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

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

[translation]

commit 042822cc7c99a3fdd772e90d0fde988edcc2f742
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:10 2014 +

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

diff --git a/tr/gettor.po b/tr/gettor.po
index 657fed9..dbeabdd 100644
--- a/tr/gettor.po
+++ b/tr/gettor.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-19 13:40+0100\n"
-"PO-Revision-Date: 2014-10-17 11:31+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,7 @@ msgstr "Bana hangisini istediğinizi söylerseniz size 
e-posta aracılığı ile
 msgid ""
 "Please reply to this mail, and tell me a single package name anywhere \n"
 "in the body of your email."
-msgstr "Lütfen bu e-postayı yanıtlayarak ileti gövdesinde tek bir paket 
adını belirtin."
+msgstr "Lütfen bu e-postayı yanıtlayarak ileti gövdesinde \ntek bir paket 
adını belirtin."
 
 #: lib/gettor/i18n.py:64
 msgid ""
@@ -110,7 +110,7 @@ msgstr "Desteklenen yerel ayarlar:"
 
 #: lib/gettor/i18n.py:78
 msgid "Here is a list of all available languages:"
-msgstr "Desteklenen dillerin dizelgesi:"
+msgstr "Desteklenen dillerin listesi:"
 
 #: lib/gettor/i18n.py:80
 msgid ""
@@ -157,7 +157,7 @@ msgstr "Yeni bir satıra \"split\" sözcüğünü 
aşağıdaki gibi tek başına
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
 "the Tor Browser Bundle in a number of 1,4MB attachments."
-msgstr "Bu metni e-posta ile GetTor'a göndermeniz Tor Tarayıcı 
Paketinin\n1.4 MB ekler halinde size gönderilmesini sağlayacaktır."
+msgstr "Bu metni e-posta ile GetTor'a göndermeniz Tor Tarayıcı 
Paketi'nin\n1.4 MB ekler halinde size gönderilmesini sağlayacaktır."
 
 #: lib/gettor/i18n.py:110
 msgid ""
@@ -377,7 +377,7 @@ msgstr "macos-ppc:\nPowerPC mimarisi kullanan OS X tabanlı 
eski Mac'ler için o
 msgid ""
 "linux-i386:\n"
 "The Tor Browser Bundle package for Linux, 32bit versions."
-msgstr "linux-i386:\nTor Tarayıcı Paketinin 32-bit Linux sürümü."
+msgstr "linux-i386:\nTor Tarayıcı Paketi'nin 32-bit Linux sürümü."
 
 #: lib/gettor/i18n.py:238
 msgid ""

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

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

[translation]

commit 6bf19f7294605066f2a4f326b0dbb4c00952914f
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:03 2014 +

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

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index fe64ce6..427751d 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2014-07-26 02:11+\n"
-"PO-Revision-Date: 2014-10-17 11:31+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,7 @@ msgstr ""
 #. "Tor Browser"
 #: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
-msgstr "Üzgünüz. İsteğinizle ilgili bir hata oluştu."
+msgstr "Üzgünüz! İsteğinizle ilgili bir hata oluştu."
 
 #: lib/bridgedb/strings.py:18
 msgid "[This is an automated message; please do not reply.]"
@@ -66,7 +66,7 @@ msgstr "KOMUTlar: (birden fazla seçeneğı aynı anda 
belirtmek için KOMUTlar
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB'ye hoş geldiniz!"
+msgstr "BridgeDB'ye Hoş Geldiniz!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: lib/bridgedb/strings.py:30
@@ -155,13 +155,13 @@ msgstr "Köprüleri almanın diğer bir yolu da %s 
adresine bir e-posta gönderm
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
-msgstr "Köprülerim çalışmıyor! Yardım gerek!"
+msgstr "Köprülerim çalışmıyor! Yardıma ihtiyacım var!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor'unuz çalışmıyorsa %s'a e-posta göndermelisiniz. "
+msgstr "Tor'unuz çalışmıyorsa %s adresine e-posta göndermelisiniz. "
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -179,7 +179,7 @@ msgstr "İşte köprü çizgileriniz:"
 
 #: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
-msgstr "Köprüleri al!"
+msgstr "Köprüleri Al!"
 
 #: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
@@ -265,7 +265,7 @@ msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasını 
al."
 
 #: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
-msgstr "Bir hata bildir"
+msgstr "Bir hata Bildir"
 
 #: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
@@ -289,7 +289,7 @@ msgstr "Bu da nesi!"
 
 #: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
-msgstr "Şu anda hiçbir köprü müsait değil…"
+msgstr "Şu anda kullanılabilecek bir köprü yok..."
 
 #: lib/bridgedb/templates/bridges.html:73
 #, python-format
@@ -306,7 +306,7 @@ msgstr "%s1%s adım"
 #: lib/bridgedb/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Tarayıcı'yı %s indirin"
+msgstr "%s Tor Tarayıcı'yı %s İndirin"
 
 #: lib/bridgedb/templates/index.html:25
 #, python-format
@@ -316,7 +316,7 @@ msgstr "Adım %s2%s"
 #: lib/bridgedb/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "%s köprülerini %s edin"
+msgstr "%s Köprüleri %s edinin"
 
 #: lib/bridgedb/templates/index.html:36
 #, python-format
@@ -335,7 +335,7 @@ msgstr "Şimdi %s köprüleri Tor Tarayıcı'ya ekleyin %s"
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sana köprüler ver!"
+msgstr "%sB%sana köprüleri ver!"
 
 #: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"

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

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

[translation]

commit b897e1b6ce3f3ce52b1b837b32b89fea01ec5399
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:20 2014 +

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

diff --git a/tr/torcheck.po b/tr/torcheck.po
index 9a22f76..b854b0e 100644
--- a/tr/torcheck.po
+++ b/tr/torcheck.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2014-10-17 11:00+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgid ""
 msgstr "Tor Projesi kendini çevrimiçi gizliliğin ve mahremiyetin 
araştırılmasına, geliştirilmesine ve eğitimine adamış ABD 501(c)(3) kar 
amacı gütmeyen bir kuruluştur."
 
 msgid "Learn More »"
-msgstr "Daha fazlasını öğrenin »"
+msgstr "Daha Fazlasını Öğrenin »"
 
 msgid "Go"
 msgstr "Git"
@@ -83,10 +83,10 @@ msgid "Short User Manual"
 msgstr "Kısa Kullanıcı Kılavuzu"
 
 msgid "Donate to Support Tor"
-msgstr "Tor'u desteklemek için bağış yapın"
+msgstr "Tor'u Desteklemek için Bağış Yapın"
 
 msgid "Tor Q&A Site"
-msgstr "Tor Soru-Yanıt Sitesi"
+msgstr "Tor Soru-Cevap Sitesi"
 
 msgid "Volunteer"
 msgstr "Gönüllü"

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

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

[translation]

commit 8c0eb72eab7da3a880f63e15d49d471d6a85ba8d
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:13 2014 +

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

diff --git a/tr/gettor.po b/tr/gettor.po
index 657fed9..dbeabdd 100644
--- a/tr/gettor.po
+++ b/tr/gettor.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-19 13:40+0100\n"
-"PO-Revision-Date: 2014-10-17 11:31+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,7 @@ msgstr "Bana hangisini istediğinizi söylerseniz size 
e-posta aracılığı ile
 msgid ""
 "Please reply to this mail, and tell me a single package name anywhere \n"
 "in the body of your email."
-msgstr "Lütfen bu e-postayı yanıtlayarak ileti gövdesinde tek bir paket 
adını belirtin."
+msgstr "Lütfen bu e-postayı yanıtlayarak ileti gövdesinde \ntek bir paket 
adını belirtin."
 
 #: lib/gettor/i18n.py:64
 msgid ""
@@ -110,7 +110,7 @@ msgstr "Desteklenen yerel ayarlar:"
 
 #: lib/gettor/i18n.py:78
 msgid "Here is a list of all available languages:"
-msgstr "Desteklenen dillerin dizelgesi:"
+msgstr "Desteklenen dillerin listesi:"
 
 #: lib/gettor/i18n.py:80
 msgid ""
@@ -157,7 +157,7 @@ msgstr "Yeni bir satıra \"split\" sözcüğünü 
aşağıdaki gibi tek başına
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
 "the Tor Browser Bundle in a number of 1,4MB attachments."
-msgstr "Bu metni e-posta ile GetTor'a göndermeniz Tor Tarayıcı 
Paketinin\n1.4 MB ekler halinde size gönderilmesini sağlayacaktır."
+msgstr "Bu metni e-posta ile GetTor'a göndermeniz Tor Tarayıcı 
Paketi'nin\n1.4 MB ekler halinde size gönderilmesini sağlayacaktır."
 
 #: lib/gettor/i18n.py:110
 msgid ""
@@ -377,7 +377,7 @@ msgstr "macos-ppc:\nPowerPC mimarisi kullanan OS X tabanlı 
eski Mac'ler için o
 msgid ""
 "linux-i386:\n"
 "The Tor Browser Bundle package for Linux, 32bit versions."
-msgstr "linux-i386:\nTor Tarayıcı Paketinin 32-bit Linux sürümü."
+msgstr "linux-i386:\nTor Tarayıcı Paketi'nin 32-bit Linux sürümü."
 
 #: lib/gettor/i18n.py:238
 msgid ""

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

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

[translation]

commit 564949a852592e184bb7a4a8747d642076f72df4
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:07 2014 +

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

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index fe64ce6..427751d 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2014-07-26 02:11+\n"
-"PO-Revision-Date: 2014-10-17 11:31+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,7 @@ msgstr ""
 #. "Tor Browser"
 #: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
-msgstr "Üzgünüz. İsteğinizle ilgili bir hata oluştu."
+msgstr "Üzgünüz! İsteğinizle ilgili bir hata oluştu."
 
 #: lib/bridgedb/strings.py:18
 msgid "[This is an automated message; please do not reply.]"
@@ -66,7 +66,7 @@ msgstr "KOMUTlar: (birden fazla seçeneğı aynı anda 
belirtmek için KOMUTlar
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB'ye hoş geldiniz!"
+msgstr "BridgeDB'ye Hoş Geldiniz!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: lib/bridgedb/strings.py:30
@@ -155,13 +155,13 @@ msgstr "Köprüleri almanın diğer bir yolu da %s 
adresine bir e-posta gönderm
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
-msgstr "Köprülerim çalışmıyor! Yardım gerek!"
+msgstr "Köprülerim çalışmıyor! Yardıma ihtiyacım var!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor'unuz çalışmıyorsa %s'a e-posta göndermelisiniz. "
+msgstr "Tor'unuz çalışmıyorsa %s adresine e-posta göndermelisiniz. "
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -179,7 +179,7 @@ msgstr "İşte köprü çizgileriniz:"
 
 #: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
-msgstr "Köprüleri al!"
+msgstr "Köprüleri Al!"
 
 #: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
@@ -265,7 +265,7 @@ msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasını 
al."
 
 #: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
-msgstr "Bir hata bildir"
+msgstr "Bir hata Bildir"
 
 #: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
@@ -289,7 +289,7 @@ msgstr "Bu da nesi!"
 
 #: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
-msgstr "Şu anda hiçbir köprü müsait değil…"
+msgstr "Şu anda kullanılabilecek bir köprü yok..."
 
 #: lib/bridgedb/templates/bridges.html:73
 #, python-format
@@ -306,7 +306,7 @@ msgstr "%s1%s adım"
 #: lib/bridgedb/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Tarayıcı'yı %s indirin"
+msgstr "%s Tor Tarayıcı'yı %s İndirin"
 
 #: lib/bridgedb/templates/index.html:25
 #, python-format
@@ -316,7 +316,7 @@ msgstr "Adım %s2%s"
 #: lib/bridgedb/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "%s köprülerini %s edin"
+msgstr "%s Köprüleri %s edinin"
 
 #: lib/bridgedb/templates/index.html:36
 #, python-format
@@ -335,7 +335,7 @@ msgstr "Şimdi %s köprüleri Tor Tarayıcı'ya ekleyin %s"
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sana köprüler ver!"
+msgstr "%sB%sana köprüleri ver!"
 
 #: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"

___
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

[translation]

commit cb917964ec62fa6bbddc9db3a7d068c9bea72195
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:13 2014 +

Update translations for tor-launcher-network-settings_completed
---
 tr/network-settings.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index ce4e64a..ab4905c 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -26,7 +26,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 3c66d7a2487dbfa8be4814a87c7ce3a3ae0fd9b0
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:07 2014 +

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

diff --git a/tr/progress.dtd b/tr/progress.dtd
index 4ef301d..b17bf4b 100644
--- a/tr/progress.dtd
+++ b/tr/progress.dtd
@@ -1,4 +1,4 @@
 
-
+
 
 

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

[translation]

commit 2611692aacbe66806300ba54b246ff67fb7aad49
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:37 2014 +

Update translations for liveusb-creator
---
 tr/tr.po |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 3de7dd2..81c2f04 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-15 16:05+0200\n"
-"PO-Revision-Date: 2014-10-17 11:41+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "Bulunamadı"
 #: ../liveusb/creator.py:556
 #, python-format
 msgid "Cannot find device %s"
-msgstr "Aygıt bulunamadı %s"
+msgstr "%s aygıtı bulunamadı"
 
 #: ../liveusb/launcher_ui.py:150
 msgid ""
@@ -299,12 +299,12 @@ msgstr " %(file)s siliniyor"
 
 #: ../liveusb/creator.py:483
 msgid "Removing existing Live OS"
-msgstr "Mevcut Çalışır İŞ kaldırılıyor"
+msgstr "Mevcut Çalışan İS kaldırılıyor"
 
 #: ../liveusb/creator.py:1148
 #, python-format
 msgid "Resetting Master Boot Record of %s"
-msgstr "%s'in Ana Önyükleme Kaydı sıfırlanıyor"
+msgstr "%s'in Ana Önyükleme Kaydı Sıfırlanıyor"
 
 #: ../liveusb/gui.py:758
 msgid "Select Live ISO"
@@ -416,22 +416,22 @@ msgstr "Win32_LogicalDisk alınamadı; win32com sorgusu 
hiçbir sonuç döndürm
 
 #: ../liveusb/gui.py:660
 msgid "Unable to mount device"
-msgstr "Aygıt bağlanılamadı"
+msgstr "Aygıt bağlanamıyor"
 
 #: ../liveusb/creator.py:804
 #, python-format
 msgid "Unable to mount device: %(message)s"
-msgstr "Aygıt takılamıyor: %(message)s"
+msgstr "Aygıt bağlanamıyor: %(message)s"
 
 #: ../liveusb/creator.py:508
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
-msgstr "Önceki ÇalışırİŞ'den klasör silinmesi başarısız: 
%(message)s"
+msgstr "Önceki ÇalışanİS'den klasör silinmesi başarısız: %(message)s"
 
 #: ../liveusb/creator.py:496
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
-msgstr "Önceki ÇalışırİŞ'den dosya silinmesi başarısız: %(message)s"
+msgstr "Önceki ÇalışanİS'den dosya silinmesi başarısız: %(message)s"
 
 #: ../liveusb/creator.py:1151
 msgid ""

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

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

[translation]

commit f532d962a5778dfdf6e39a02a2ec9421c42019a4
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:26 2014 +

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

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 7b39bd2..5e6e3e5 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 3e8a0287eba5a639284849c221be33fbc2c003be
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:20 2014 +

Update translations for tails-misc_completed
---
 tr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.po b/tr.po
index 5556c07..6f8b2d4 100644
--- a/tr.po
+++ b/tr.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-15 17:57+0200\n"
-"PO-Revision-Date: 2014-10-17 12:01+\n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

[translation]

commit 5df092e163784b79a9f82e012ec06453f921ee10
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:40 2014 +

Update translations for liveusb-creator_completed
---
 tr/tr.po |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tr/tr.po b/tr/tr.po
index 3de7dd2..81c2f04 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-15 16:05+0200\n"
-"PO-Revision-Date: 2014-10-17 11:41+\n"
-"Last-Translator: Emir Sarı \n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "Bulunamadı"
 #: ../liveusb/creator.py:556
 #, python-format
 msgid "Cannot find device %s"
-msgstr "Aygıt bulunamadı %s"
+msgstr "%s aygıtı bulunamadı"
 
 #: ../liveusb/launcher_ui.py:150
 msgid ""
@@ -299,12 +299,12 @@ msgstr " %(file)s siliniyor"
 
 #: ../liveusb/creator.py:483
 msgid "Removing existing Live OS"
-msgstr "Mevcut Çalışır İŞ kaldırılıyor"
+msgstr "Mevcut Çalışan İS kaldırılıyor"
 
 #: ../liveusb/creator.py:1148
 #, python-format
 msgid "Resetting Master Boot Record of %s"
-msgstr "%s'in Ana Önyükleme Kaydı sıfırlanıyor"
+msgstr "%s'in Ana Önyükleme Kaydı Sıfırlanıyor"
 
 #: ../liveusb/gui.py:758
 msgid "Select Live ISO"
@@ -416,22 +416,22 @@ msgstr "Win32_LogicalDisk alınamadı; win32com sorgusu 
hiçbir sonuç döndürm
 
 #: ../liveusb/gui.py:660
 msgid "Unable to mount device"
-msgstr "Aygıt bağlanılamadı"
+msgstr "Aygıt bağlanamıyor"
 
 #: ../liveusb/creator.py:804
 #, python-format
 msgid "Unable to mount device: %(message)s"
-msgstr "Aygıt takılamıyor: %(message)s"
+msgstr "Aygıt bağlanamıyor: %(message)s"
 
 #: ../liveusb/creator.py:508
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
-msgstr "Önceki ÇalışırİŞ'den klasör silinmesi başarısız: 
%(message)s"
+msgstr "Önceki ÇalışanİS'den klasör silinmesi başarısız: %(message)s"
 
 #: ../liveusb/creator.py:496
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
-msgstr "Önceki ÇalışırİŞ'den dosya silinmesi başarısız: %(message)s"
+msgstr "Önceki ÇalışanİS'den dosya silinmesi başarısız: %(message)s"
 
 #: ../liveusb/creator.py:1151
 msgid ""

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

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

[translation]

commit 3d3c5bb3b633505806a438438770384a1abde0a1
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:23 2014 +

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

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 7b39bd2..5e6e3e5 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit b53abf63b3d8366491527b8d3f3d647893ba3592
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:52 2014 +

Update translations for torbirdy_completed
---
 tr/torbirdy.dtd |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index 1051852..2155ce6 100644
--- a/tr/torbirdy.dtd
+++ b/tr/torbirdy.dtd
@@ -11,8 +11,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 7a6d401d4ee31b964bfe2f221734b3bb4b50fde4
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:17 2014 +

Update translations for tails-misc
---
 tr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.po b/tr.po
index 5556c07..6f8b2d4 100644
--- a/tr.po
+++ b/tr.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-15 17:57+0200\n"
-"PO-Revision-Date: 2014-10-17 12:01+\n"
+"PO-Revision-Date: 2014-10-29 02:00+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"

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

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

[translation]

commit 4d169fca332584cb40898c009f9e3aca7977f63a
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:00 2014 +

Update translations for tor-launcher-properties_completed
---
 tr/torlauncher.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index a0274eb..f4ca504 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=%S aktarım türü 
için sağlanan kul
 torlauncher.recommended_bridge=(önerilen)
 
 torlauncher.connect=Bağlan
-torlauncher.restart_tor=Tor'u yeniden başlat
+torlauncher.restart_tor=Tor'u Yeniden Başlat
 torlauncher.quit=Çık
 torlauncher.quit_win=Çıkış
 torlauncher.done=Tamamlandı
@@ -41,9 +41,9 @@ torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor 
günlük mesajları
 
 torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor
 torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı 
kuruluyor
-torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelleniyor
+torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor
 torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor
-torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını 
yükleniyor
+torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikaları yükleniyor
 torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor
 torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor
 torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor
@@ -52,7 +52,7 @@ torlauncher.bootstrapStatus.done=Tor ağına bağlandı!
 
 torlauncher.bootstrapWarning.done=tamam
 torlauncher.bootstrapWarning.connectrefused=bağlantı geri çevrildi
-torlauncher.bootstrapWarning.misc=diğer
+torlauncher.bootstrapWarning.misc=çeşitli
 torlauncher.bootstrapWarning.resourcelimit=yetersiz kaynak
 torlauncher.bootstrapWarning.identity=kimlik uyumsuz
 torlauncher.bootstrapWarning.timeout=zaman aşımı

___
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

[translation]

commit 444cd41679476c863fcf4ba3fa1deae56f4765fe
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:10 2014 +

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

diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index ce4e64a..ab4905c 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -26,7 +26,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 132a0bbbafe86c6fa936a5f912b3c3c16b312a84
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:57 2014 +

Update translations for tor-launcher-properties
---
 tr/torlauncher.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index a0274eb..f4ca504 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=%S aktarım türü 
için sağlanan kul
 torlauncher.recommended_bridge=(önerilen)
 
 torlauncher.connect=Bağlan
-torlauncher.restart_tor=Tor'u yeniden başlat
+torlauncher.restart_tor=Tor'u Yeniden Başlat
 torlauncher.quit=Çık
 torlauncher.quit_win=Çıkış
 torlauncher.done=Tamamlandı
@@ -41,9 +41,9 @@ torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor 
günlük mesajları
 
 torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor
 torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı 
kuruluyor
-torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelleniyor
+torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor
 torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor
-torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını 
yükleniyor
+torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikaları yükleniyor
 torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor
 torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor
 torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor
@@ -52,7 +52,7 @@ torlauncher.bootstrapStatus.done=Tor ağına bağlandı!
 
 torlauncher.bootstrapWarning.done=tamam
 torlauncher.bootstrapWarning.connectrefused=bağlantı geri çevrildi
-torlauncher.bootstrapWarning.misc=diğer
+torlauncher.bootstrapWarning.misc=çeşitli
 torlauncher.bootstrapWarning.resourcelimit=yetersiz kaynak
 torlauncher.bootstrapWarning.identity=kimlik uyumsuz
 torlauncher.bootstrapWarning.timeout=zaman aşımı

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

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

[translation]

commit 36f344019c4b755bdee08626100fe843c2236807
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:28 2014 +

Update translations for https_everywhere
---
 tr/https-everywhere.dtd|   16 
 tr/https-everywhere.properties |8 
 tr/ssl-observatory.dtd |4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index e229b84..30cf5db 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -8,18 +8,18 @@
 
 
 
-
+
 
 
 
 
-
-
+
+
 
 
-
-
-
+
+
+
 
 
 
@@ -28,8 +28,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties
index d6e3a9b..77818f2 100644
--- a/tr/https-everywhere.properties
+++ b/tr/https-everywhere.properties
@@ -1,7 +1,7 @@
-https-everywhere.menu.globalEnable = HTTPS Her Yerde'yi etkinleştir
-https-everywhere.menu.globalDisable = HTTPS Her Yerde'yi devre dışı bırak
-https-everywhere.menu.enableDisable = Kuralları aç/kapa
-https-everywhere.menu.noRules = (Bu sayfa için hiçbir kural yok)
+https-everywhere.menu.globalEnable = HTTPS Her Yerde'yi Etkinleştir
+https-everywhere.menu.globalDisable = HTTPS Her Yerde'yi Devre Dışı Bırak
+https-everywhere.menu.enableDisable = Kuralları Aç/Kapa
+https-everywhere.menu.noRules = (Bu Sayfa için Hiçbir Kural Yok)
 https-everywhere.menu.unknownRules = (Bu sayfa için hangi kuralların 
kullanılacağı bilinmiyor)
 https-everywhere.toolbar.hint = HTTPS Her Yerde şu an etkin. Adres 
çubuğundaki simgeye tıklayarak istediğiniz sitelerde açıp 
kapatabilirsiniz.
 https-everywhere.migration.notification0 = Bu güncelleme, önemli onarımı 
uygulamak için, HTTPS Everywhere kural tercihlerinizi varsayılan değerlerine 
çevirir.
diff --git a/tr/ssl-observatory.dtd b/tr/ssl-observatory.dtd
index 0ab1e1b..37e5f41 100644
--- a/tr/ssl-observatory.dtd
+++ b/tr/ssl-observatory.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
 "Bu ağın "Özerk Sistemi numarası" alıp göndereceğiz. Bu bize 
HTTPS'e karşı gerçekleştirilen yerel saldırıları belirlemekte ve 
nispeten İran ve Suriye gibi yerlerde ağlara karşı gözlemler olup 
olmadığını belirlemek için yardımcı olacaktır.">
 
 
+"Gözlemci, tarayıcınız tarafından yakalanamayan geçersiz bir sertifika 
tespit ettiğinde bir uyarı göster">
 
 

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

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

[translation]

commit d801ed632d1a108917c398ec9a0e9193b655db12
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:48 2014 +

Update translations for torbirdy
---
 tr/torbirdy.dtd |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index 1051852..2155ce6 100644
--- a/tr/torbirdy.dtd
+++ b/tr/torbirdy.dtd
@@ -11,8 +11,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 0e47831e63a839c899c6c5a77567d22ef89001c1
Author: Translation commit bot 
Date:   Wed Oct 29 02:15:34 2014 +

Update translations for https_everywhere_completed
---
 tr/https-everywhere.dtd|   16 
 tr/https-everywhere.properties |8 
 tr/ssl-observatory.dtd |4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index e229b84..30cf5db 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -8,18 +8,18 @@
 
 
 
-
+
 
 
 
 
-
-
+
+
 
 
-
-
-
+
+
+
 
 
 
@@ -28,8 +28,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties
index d6e3a9b..77818f2 100644
--- a/tr/https-everywhere.properties
+++ b/tr/https-everywhere.properties
@@ -1,7 +1,7 @@
-https-everywhere.menu.globalEnable = HTTPS Her Yerde'yi etkinleştir
-https-everywhere.menu.globalDisable = HTTPS Her Yerde'yi devre dışı bırak
-https-everywhere.menu.enableDisable = Kuralları aç/kapa
-https-everywhere.menu.noRules = (Bu sayfa için hiçbir kural yok)
+https-everywhere.menu.globalEnable = HTTPS Her Yerde'yi Etkinleştir
+https-everywhere.menu.globalDisable = HTTPS Her Yerde'yi Devre Dışı Bırak
+https-everywhere.menu.enableDisable = Kuralları Aç/Kapa
+https-everywhere.menu.noRules = (Bu Sayfa için Hiçbir Kural Yok)
 https-everywhere.menu.unknownRules = (Bu sayfa için hangi kuralların 
kullanılacağı bilinmiyor)
 https-everywhere.toolbar.hint = HTTPS Her Yerde şu an etkin. Adres 
çubuğundaki simgeye tıklayarak istediğiniz sitelerde açıp 
kapatabilirsiniz.
 https-everywhere.migration.notification0 = Bu güncelleme, önemli onarımı 
uygulamak için, HTTPS Everywhere kural tercihlerinizi varsayılan değerlerine 
çevirir.
diff --git a/tr/ssl-observatory.dtd b/tr/ssl-observatory.dtd
index 0ab1e1b..37e5f41 100644
--- a/tr/ssl-observatory.dtd
+++ b/tr/ssl-observatory.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
 "Bu ağın "Özerk Sistemi numarası" alıp göndereceğiz. Bu bize 
HTTPS'e karşı gerçekleştirilen yerel saldırıları belirlemekte ve 
nispeten İran ve Suriye gibi yerlerde ağlara karşı gözlemler olup 
olmadığını belirlemek için yardımcı olacaktır.">
 
 
+"Gözlemci, tarayıcınız tarafından yakalanamayan geçersiz bir sertifika 
tespit ettiğinde bir uyarı göster">
 
 

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

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

[translation]

commit ede01ef5a29d9f5ab8c5e9ff8b22dfd48d0a2ac7
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:33 2014 +

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

diff --git a/tr/browser.properties b/tr/browser.properties
index 1d45459..295a03a 100644
--- a/tr/browser.properties
+++ b/tr/browser.properties
@@ -5,9 +5,9 @@ browser.startup.homepage=about:tor
 spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=BaşlangıçSayfası
+browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=BaşlangıçSayfası
+browser.search.order.1=Startpage
 browser.search.order.2=DuckDuckGo
 browser.search.order.3=Google

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

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

[translation]

commit c77cbf626ec4fbb29889506fe66d3804d88a5750
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:37 2014 +

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

diff --git a/tr/browser.properties b/tr/browser.properties
index 1d45459..295a03a 100644
--- a/tr/browser.properties
+++ b/tr/browser.properties
@@ -5,9 +5,9 @@ browser.startup.homepage=about:tor
 spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=BaşlangıçSayfası
+browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=BaşlangıçSayfası
+browser.search.order.1=Startpage
 browser.search.order.2=DuckDuckGo
 browser.search.order.3=Google

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

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

[translation]

commit bacc27d601c725b5b83add31c23f61ce35ab01e3
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:04 2014 +

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

diff --git a/tr/progress.dtd b/tr/progress.dtd
index 4ef301d..b17bf4b 100644
--- a/tr/progress.dtd
+++ b/tr/progress.dtd
@@ -1,4 +1,4 @@
 
-
+
 
 

___
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

[translation]

commit fe23f2811f71fa89ac0424afbae74e73332762d1
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:40 2014 +

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

diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index b810433..5a39ac2 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -1,5 +1,5 @@
-torbutton.button.tooltip.disabled = Tor'u etkinleştir
-torbutton.button.tooltip.enabled = Tor'u devre dışı bırak
+torbutton.button.tooltip.disabled = Tor'u Etkinleştir
+torbutton.button.tooltip.enabled = Tor'u Devre Dışı Bırak
 torbutton.panel.tooltip.disabled = Tor'u etkinleştirmek için tıklayın
 torbutton.panel.tooltip.enabled = Tor'u devre dışı bırakmak için 
tıklayın
 torbutton.panel.plugins.disabled = Eklentileri etkinleştirmek için tıklayın

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

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

[translation]

commit 180373e28c12b1555b489e6930c9f8be28b80f08
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:45 2014 +

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

diff --git a/tr.po b/tr.po
index 4441857..d8fd214 100644
--- a/tr.po
+++ b/tr.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-09-18 21:27-0700\n"
-"PO-Revision-Date: 2014-09-19 09:58+\n"
-"Last-Translator: runasand \n"
+"POT-Creation-Date: 2014-10-08 21:09+0200\n"
+"PO-Revision-Date: 2014-10-29 01:50+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523
 #: ../lib/Tails/IUK/Frontend.pm:667
 msgid "For debugging information, see /home/amnesia/.xsession-errors"
-msgstr "Hata ayıklama bilgileri için, see /home/amnesia/.xsession-errors"
+msgstr "Hata ayıklama bilgileri için, bkz. /home/amnesia/.xsession-errors"
 
 #: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"

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

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

[translation]

commit c1d6ab5754c093464fa3f8e2055960a5adfa6797
Author: Translation commit bot 
Date:   Wed Oct 29 02:16:48 2014 +

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

diff --git a/tr.po b/tr.po
index 4441857..d8fd214 100644
--- a/tr.po
+++ b/tr.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-09-18 21:27-0700\n"
-"PO-Revision-Date: 2014-09-19 09:58+\n"
-"Last-Translator: runasand \n"
+"POT-Creation-Date: 2014-10-08 21:09+0200\n"
+"PO-Revision-Date: 2014-10-29 01:50+\n"
+"Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523
 #: ../lib/Tails/IUK/Frontend.pm:667
 msgid "For debugging information, see /home/amnesia/.xsession-errors"
-msgstr "Hata ayıklama bilgileri için, see /home/amnesia/.xsession-errors"
+msgstr "Hata ayıklama bilgileri için, bkz. /home/amnesia/.xsession-errors"
 
 #: ../lib/Tails/IUK/Frontend.pm:216
 msgid "Error while checking for upgrades"

___
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] Remove merged Instantbird patches

[arlo]

commit f1318bb3eb2a55c4efa7ac5fe83d4282b2718935
Author: Arlo Breault 
Date:   Tue Oct 28 20:17:27 2014 -0700

Remove merged Instantbird patches

 * https://hg.mozilla.org/comm-central/rev/332650fa4e8d

 * https://hg.mozilla.org/comm-central/rev/6b5ab77843f5
---
 ...raw-msgs-through-the-conversation-service.patch |   33 --
 projects/instantbird/config|2 --
 projects/instantbird/null.patch|   36 
 3 files changed, 71 deletions(-)

diff --git 
a/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch 
b/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch
deleted file mode 100644
index 5600781..000
--- a/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Arlo Breault 
-# Date 1413057966 25200
-#  Sat Oct 11 13:06:06 2014 -0700
-# Node ID 7647c0a6d75b97678d048d2a07f01f5e6b7d4346
-# Parent  b8497b2decd436a972daa74b3e6707d8bed835ae
-Send raw msgs through the conversation service
-
-diff --git a/chat/components/src/imCommands.js 
b/chat/components/src/imCommands.js
 a/chat/components/src/imCommands.js
-+++ b/chat/components/src/imCommands.js
-@@ -29,17 +29,20 @@ CommandsService.prototype = {
- });
- 
- this.registerCommand({
-   name: "raw",
-   get helpString() _("rawHelpString"),
-   usageContext: Ci.imICommand.CMD_CONTEXT_ALL,
-   priority: Ci.imICommand.CMD_PRIORITY_DEFAULT,
-   run: function(aMsg, aConv) {
--aConv.sendMsg(aMsg);
-+let conv = Services.conversations.getUIConversation(aConv);
-+if (!conv)
-+  return false;
-+conv.sendMsg(aMsg);
- return true;
-   }
- });
- 
- this.registerCommand({
-   // Reference the command service so we can use the internal properties
-   // directly.
-   cmdSrv: this,
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 02bedcf..58c4030 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -47,8 +47,6 @@ input_files:
   - filename: facebook.patch
   - filename: accountcreation.patch
   - filename: prepare-messages-for-displaying.patch
-  - filename: Send-raw-msgs-through-the-conversation-service.patch
-  - filename: null.patch
   - filename: purple-tests.patch
   - filename: 'mozconfig-[% c("var/osname") %]'
 name: mozconfig
diff --git a/projects/instantbird/null.patch b/projects/instantbird/null.patch
deleted file mode 100644
index 868f440..000
--- a/projects/instantbird/null.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User Arlo Breault 
-# Date 1414169680 25200
-#  Fri Oct 24 09:54:40 2014 -0700
-# Node ID 358de61ab92e106fe0ffd877aa71371ceae0b87f
-# Parent  7e72c5322e5c082b2472e0b07a06627e222f3864
-Prevent empty messages from falling back to the original
-
- * Irc will split up messages and empty lines fall back to the encrypted
-   message in OTR.
-
-diff --git a/chat/components/src/imConversations.js 
b/chat/components/src/imConversations.js
 a/chat/components/src/imConversations.js
-+++ b/chat/components/src/imConversations.js
-@@ -29,17 +29,20 @@ function imMessage(aPrplMessage) {
- }
- imMessage.prototype = {
-   __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"),
-   cancelled: false,
-   color: "",
-   _displayMessage: null,
- 
-   get displayMessage() {
--return this._displayMessage || this.prplMessage.originalMessage;
-+// Explicitly test for null so that blank messages don't fall back to
-+// the original. Especially problematic in encryption extensions like OTR.
-+return this._displayMessage !== null ?
-+  this._displayMessage : this.prplMessage.originalMessage;
-   },
-   set displayMessage(aMsg) { this._displayMessage = aMsg; },
- 
-   get message() this.prplMessage.message,
-   set message(aMsg) { this.prplMessage.message = aMsg; },
- 
-   // from prplIMessage
-   get who() this.prplMessage.who,

___
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] Remove another unnecessary patch

[arlo]

commit 260fd4569965ee846af13cd21ddbb5b209cc8328
Author: Arlo Breault 
Date:   Tue Oct 28 20:29:34 2014 -0700

Remove another unnecessary patch

 * Commented out in https://hg.mozilla.org/comm-central/rev/0ac236b0be38
---
 projects/instantbird/config |1 -
 projects/instantbird/purple-tests.patch |   21 -
 2 files changed, 22 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 58c4030..d9f25dc 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -47,7 +47,6 @@ input_files:
   - filename: facebook.patch
   - filename: accountcreation.patch
   - filename: prepare-messages-for-displaying.patch
-  - filename: purple-tests.patch
   - filename: 'mozconfig-[% c("var/osname") %]'
 name: mozconfig
   - name: python
diff --git a/projects/instantbird/purple-tests.patch 
b/projects/instantbird/purple-tests.patch
deleted file mode 100644
index a0f7671..000
--- a/projects/instantbird/purple-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Arlo Breault 
-# Date 1414176284 25200
-#  Fri Oct 24 11:44:44 2014 -0700
-# Node ID 77ce49687f31b9634c2c32f76777a17d85e23b72
-# Parent  358de61ab92e106fe0ffd877aa71371ceae0b87f
-Remove purple testing
-
-diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini
 a/im/test/xpcshell.ini
-+++ b/im/test/xpcshell.ini
-@@ -1,9 +1,8 @@
- ; This Source Code Form is subject to the terms of the Mozilla Public
- ; License, v. 2.0. If a copy of the MPL was not distributed with this
- ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- [include:chat/modules/test/xpcshell.ini]
- [include:chat/components/src/test/xpcshell.ini]
- [include:chat/protocols/irc/test/xpcshell.ini]
- [include:chat/protocols/yahoo/test/xpcshell.ini]
--[include:extensions/purple/purplexpcom/src/test/xpcshell.ini]

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