[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-08-24 Thread translation
commit b829d93af76a08802a68285a9575b9eea57ab50d
Author: Translation commit bot 
Date:   Thu Aug 25 06:47:57 2016 +

Update translations for tor-messenger-ircproperties
---
 ur/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/irc.properties b/ur/irc.properties
index a086a13..aba16b5 100644
--- a/ur/irc.properties
+++ b/ur/irc.properties
@@ -205,4 +205,4 @@ tooltip.serverValue=%1$S (%2$S)
 # LOCALIZATION NOTE (yes, no):
 #  These are used to turn true/false values into a yes/no response.
 yes=Yes
-no=No
+no=نہیں

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


[tor-commits] [translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd

2016-08-24 Thread translation
commit f51314bea8fbeaebb48940ceb6296c2a46fc9e73
Author: Translation commit bot 
Date:   Thu Aug 25 06:48:19 2016 +

Update translations for tor-messenger-privdtd
---
 ur/priv.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ur/priv.dtd b/ur/priv.dtd
new file mode 100644
index 000..7007979
--- /dev/null
+++ b/ur/priv.dtd
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file

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


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

2016-08-24 Thread translation
commit b6826b7436e98e31af5b5c36ab8691dd92d0fd1d
Author: Translation commit bot 
Date:   Thu Aug 25 06:48:39 2016 +

Update translations for tails-onioncircuits
---
 ur/onioncircuits.pot | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ur/onioncircuits.pot b/ur/onioncircuits.pot
index 0236726..8ee3cdc 100644
--- a/ur/onioncircuits.pot
+++ b/ur/onioncircuits.pot
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-06-01 09:23+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-25 06:27+\n"
+"Last-Translator: Muhammad Sohaib Raza \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr ""
+msgstr "آپ فی الحال ٹور سے منسلک نہیں ہیں۔۔۔"
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"

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


[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-24 Thread translation
commit 02e1af199ecc0e4768fdd575ae0d7dbe6348ee7d
Author: Translation commit bot 
Date:   Thu Aug 25 06:48:13 2016 +

Update translations for tor-messenger-prefsdtd
---
 ur/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/prefs.dtd b/ur/prefs.dtd
index 2ae9c9c..c9b5447 100644
--- a/ur/prefs.dtd
+++ b/ur/prefs.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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


[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd

2016-08-24 Thread translation
commit 182f15d3d849a758bc90b171eba7c4cd32ef700c
Author: Translation commit bot 
Date:   Thu Aug 25 06:47:17 2016 +

Update translations for tor-messenger-authdtd
---
 ur/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/auth.dtd b/ur/auth.dtd
index 51b2ca3..0d3a7e2 100644
--- a/ur/auth.dtd
+++ b/ur/auth.dtd
@@ -3,7 +3,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-network-settings] Update translations for tor-launcher-network-settings

2016-08-24 Thread translation
commit 17c57f552fed69fe523b65dbed26fae69e03f5c9
Author: Translation commit bot 
Date:   Thu Aug 25 06:46:10 2016 +

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

diff --git a/ur/network-settings.dtd b/ur/network-settings.dtd
index 174f353..1006388 100644
--- a/ur/network-settings.dtd
+++ b/ur/network-settings.dtd
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 

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


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

2016-08-24 Thread translation
commit 51ac9b6bd1bccd30016c392a43193a7fa35727a4
Author: Translation commit bot 
Date:   Thu Aug 25 06:46:47 2016 +

Update translations for tails-perl5lib
---
 ur.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ur.po b/ur.po
index 372fcb3..098a301 100644
--- a/ur.po
+++ b/ur.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-11 15:40+0100\n"
-"PO-Revision-Date: 2016-01-12 08:13+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-06-05 19:40+0200\n"
+"PO-Revision-Date: 2016-08-25 06:26+\n"
+"Last-Translator: Muhammad Sohaib Raza \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../lib/Tails/RunningSystem.pm:159
 msgid "Error"
-msgstr ""
+msgstr "غلطی"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""

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


[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-08-24 Thread translation
commit a54c545c3db6d84ecb6f76ecf573d8b212fe0931
Author: Translation commit bot 
Date:   Thu Aug 25 06:45:54 2016 +

Update translations for mat-gui
---
 ur.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ur.po b/ur.po
index 5cc61e9..f5f8c26 100644
--- a/ur.po
+++ b/ur.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # A. Saad Imran, 2015
+# Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-03-21 16:34+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-25 06:36+\n"
+"Last-Translator: Muhammad Sohaib Raza \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr ""
 
 #: mat-gui:151
 msgid "All files"
-msgstr ""
+msgstr "تمام دستاویز"
 
 #: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
 #: data/mat.glade:200

___
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

2016-08-24 Thread translation
commit 5683e1dee0ad0ec1b078402ac9af9066c66a4ec6
Author: Translation commit bot 
Date:   Thu Aug 25 06:46:16 2016 +

Update translations for tails-misc
---
 ur.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ur.po b/ur.po
index 8cfc7c9..10d4491 100644
--- a/ur.po
+++ b/ur.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Sohaib Raza , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 20:25+0200\n"
-"PO-Revision-Date: 2016-05-27 10:12+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-07-31 10:43+0200\n"
+"PO-Revision-Date: 2016-08-25 06:33+\n"
+"Last-Translator: Muhammad Sohaib Raza \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr ""
+msgstr "اب آپ انٹرنیٹ تک رسائی حاصل کر سکتے 
ہیں۔"
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -348,7 +349,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
-msgstr ""
+msgstr "غلطی"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45
 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

2016-08-24 Thread translation
commit 68df7a4d11475f7d40dad622f0758d1a14ef0b49
Author: Translation commit bot 
Date:   Thu Aug 25 06:45:04 2016 +

Update translations for bridgedb
---
 ur/LC_MESSAGES/bridgedb.po | 335 +++--
 1 file changed, 168 insertions(+), 167 deletions(-)

diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index dd3ffb1..067dc02 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
 msgid ""
 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'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-19 08:23+\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-08-25 06:36+\n"
 "Last-Translator: runasand \n"
-"Language-Team: Urdu 
(http://www.transifex.com/projects/p/torproject/language/ur/)\n"
+"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -28,57 +29,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "نہیں"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#,

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2016-08-24 Thread translation
commit 9cef9741494efa15e6ac63a096816ad46f7a54c0
Author: Translation commit bot 
Date:   Thu Aug 25 06:45:36 2016 +

Update translations for tails-persistence-setup
---
 ur/ur.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index 8b1b570..d8cb4e5 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-06-06 08:15+\n"
+"PO-Revision-Date: 2016-08-25 06:26+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -129,7 +129,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
 msgid "Error"
-msgstr ""
+msgstr "غلطی"
 
 #: ../lib/Tails/Persistence/Setup.pm:344
 #, perl-format

___
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

2016-08-24 Thread translation
commit be8d5d66f8dfaa393f20c0eff91debd95fbafda3
Author: Translation commit bot 
Date:   Thu Aug 25 06:45:23 2016 +

Update translations for https_everywhere
---
 ur/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ur/ssl-observatory.dtd b/ur/ssl-observatory.dtd
index fc92847..0ab4291 100644
--- a/ur/ssl-observatory.dtd
+++ b/ur/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 ___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


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

2016-08-24 Thread translation
commit 0bdce09effd3b86df475624a4c9f1966d4bb5e97
Author: Translation commit bot 
Date:   Thu Aug 25 06:45:42 2016 +

Update translations for tails-greeter
---
 ur/ur.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ur/ur.po b/ur/ur.po
index e596ba1..78a3675 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"POT-Creation-Date: 2016-06-05 19:35+0200\n"
+"PO-Revision-Date: 2016-08-25 06:36+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:7
 msgid "No"
-msgstr ""
+msgstr "نہیں"
 
 #: ../glade/persistencewindow.glade.h:8
 msgid "Passphrase:"

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


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

2016-08-24 Thread translation
commit a31a26ef69823439f6b241adab38c2b64f1a7386
Author: Translation commit bot 
Date:   Thu Aug 25 04:15:38 2016 +

Update translations for tails-greeter
---
 km/km.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/km/km.po b/km/km.po
index eedcc86..47abab9 100644
--- a/km/km.po
+++ b/km/km.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Seng Sutha , 2014
-# Sokhem Khoem , 2014
+# Sokhem Khoem , 2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-06-05 19:35+0200\n"
+"PO-Revision-Date: 2016-08-25 03:48+\n"
+"Last-Translator: Sokhem Khoem \n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -141,7 +141,7 @@ msgstr 
"ការ​ភ្ជាប់អ៊ីនធឺណិត​កុំព
 
 #: ../glade/optionswindow.glade.h:19
 msgid "Disable all networking"
-msgstr ""
+msgstr 
"បិទ​ការ​ភ្ជាប់​បណ្ដាញ​ទាំងអស់"
 
 #: ../glade/langpanel.glade.h:1
 msgid " "

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


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

2016-08-24 Thread translation
commit d347171b44571015d5b97364c152061ca5019cd2
Author: Translation commit bot 
Date:   Thu Aug 25 04:15:43 2016 +

Update translations for tails-greeter_completed
---
 km/km.po | 52 ++--
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/km/km.po b/km/km.po
index ceb7ff6..47abab9 100644
--- a/km/km.po
+++ b/km/km.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Seng Sutha , 2014
-# Sokhem Khoem , 2014
+# Sokhem Khoem , 2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-28 22:33+0200\n"
-"PO-Revision-Date: 2014-06-10 02:50+\n"
+"POT-Creation-Date: 2016-06-05 19:35+0200\n"
+"PO-Revision-Date: 2016-08-25 03:48+\n"
 "Last-Translator: Sokhem Khoem \n"
-"Language-Team: Khmer 
(http://www.transifex.com/projects/p/torproject/language/km/)\n"
+"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -92,73 +92,57 @@ msgid "Passwords do not match"
 msgstr 
"ពាក្យសម្ងាត់​មិន​ផ្គូផ្គង"
 
 #: ../glade/optionswindow.glade.h:10
-msgid "Windows camouflage"
-msgstr "Windows camouflage"
-
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"Documentation"
-msgstr "ឯកសារ"
-
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"This option makes Tails look more like Microsoft Windows 8. This may be "
-"useful in public places in order to avoid attracting suspicion."
-msgstr "ជម្រើសនេះ​ធ្វើ​ឲ្យ Tails 
មើលទៅដូច Microsoft Windows 8 ។ វា​អាច
​មាន​ប្រយោជន៍​ក្នុង​កន្លែង​សាធារណៈ​ដើម្បី​áž
…
ៀសវាង​ការ​សង្ស័យ​ដែលទាក់ទាញ។"
-
-#: ../glade/optionswindow.glade.h:13
-msgid "Activate Microsoft Windows 8 Camouflage"
-msgstr "ធ្វើ​ឲ្យ Microsoft Windows 8 Camouflage 
សកម្ម"
-
-#: ../glade/optionswindow.glade.h:14
 msgid "MAC address spoofing"
 msgstr "បញ្ឆោត​អាសយដ្ឋាន MAC"
 
-#: ../glade/optionswindow.glade.h:15
+#: ../glade/optionswindow.glade.h:11
 msgid ""
 "Documentation"
 msgstr "ឯកសារ"
 
-#: ../glade/optionswindow.glade.h:16
+#: ../glade/optionswindow.glade.h:12
 msgid ""
 "Spoofing MAC addresses hides the serial number of your network cards to the "
 "local networks. This can help you hide your geographical location."
 msgstr "ការ​បញ្ឆោត​អាសយដ្ឋាន MAC 
លាក់​លេខ​ស៊េរី​កាត​បណ្ដាញ​របស់​អ្នក​áž
…ំពោះ​បណ្ដាញ​មូលដ្ឋាន។ 
វា​អាច
​ជួយ​អ្នក​លាក់​ទីតាំង​ភូមិសាស្ត្រ​របស់​អ្នក។"
 
-#: ../glade/optionswindow.glade.h:17
+#: ../glade/optionswindow.glade.h:13
 msgid ""
 "It is generally safer to spoof MAC addresses, but it might also raise "
 "suspicion or cause network connection problems."
 msgstr "ជា​ទូទៅ
​វា​កាន់តែ​មាន​សុវត្ថិភាព​ដើម្បី​បញ្ឆោត​អាសយដ្ឋាន​
 MAC ប៉ុន្តែ​វា​ក៏​អាច
​បង្កើន​ការ​សង្ស័យ 
ឬ​ធ្វើឲ្យ​ការ​ភ្ជាប់​បណ្ដាញ​មាន​បញ្áž
 áž¶áŸ”"
 
-#: ../glade/optionswindow.glade.h:18
+#: ../glade/optionswindow.glade.h:14
 msgid "Spoof all MAC addresses"
 msgstr "បញ្ឆោត​អាសយដ្ឋាន MAC 
ទាំងអស់"
 
-#: ../glade/optionswindow.glade.h:19
+#: ../glade/optionswindow.glade.h:15
 msgid "Network configuration"
 msgstr "ការ​កំណត់​រច
នាសម្ព័ន្ធ​បណ្ដាញ"
 
-#: ../glade/optionswindow.glade.h:20
+#: ../glade/optionswindow.glade.h:16
 msgid ""
 "Documentation"
 msgstr "ឯកសារ"
 
-#: ../glade/optionswindow.glade.h:21
+#: ../glade/optionswindow.glade.h:17
 msgid ""
 "This computer's Internet connection is clear of obstacles. You would like to"
 " connect directly to the Tor network."
 msgstr 
"ការ​ភ្ជាប់​អ៊ីនធឺណិត​កុំព្យូទ័រ​នេះ​គ្មានបញ្áž
 áž¶â€‹áž‘េ។ អ្នកច
ង់ភ្ជាប់​ដោយ​ផ្ទាល់​ទៅ
​បណ្ដាញ Tor ។"
 
-#: ../glade/optionswindow.glade.h:22
+#: ../glade/optionswindow.glade.h:18
 msgid ""
 "This computer's Internet connection is censored, filtered, or proxied. You "
 "need to configure bridge, firewall, or proxy settings."
 msgstr 
"ការ​ភ្ជាប់អ៊ីនធឺណិត​កុំព្យáž

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

2016-08-24 Thread translation
commit 03e1e5fe3e65c79b4c251493f67307024f1a15e5
Author: Translation commit bot 
Date:   Wed Aug 24 23:15:03 2016 +

Update translations for bridgedb
---
 gd/LC_MESSAGES/bridgedb.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gd/LC_MESSAGES/bridgedb.po b/gd/LC_MESSAGES/bridgedb.po
index 57da660..8355c22 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Mairi Macleod , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2011-02-19 16:53+\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2016-08-24 22:53+\n"
+"Last-Translator: Mairi Macleod \n"
 "Language-Team: Gaelic, Scottish 
(http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,15 +32,15 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr ""
+msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr ""
+msgstr "Innis mu mhearachd"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
-msgstr ""
+msgstr "Còd Tùsail"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
@@ -47,11 +48,11 @@ msgstr ""
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr ""
+msgstr "Cuir fios gu"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "Tagh e uile"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"

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


[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-24 Thread translation
commit 728d81c4fb647026286f9eccd7b7a31e9d493728
Author: Translation commit bot 
Date:   Wed Aug 24 18:48:03 2016 +

Update translations for tor-messenger-prefsdtd
---
 nl/prefs.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/prefs.dtd b/nl/prefs.dtd
index 1947139..4a518e8 100644
--- a/nl/prefs.dtd
+++ b/nl/prefs.dtd
@@ -13,10 +13,10 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
 
 
\ No newline at end of file

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


[tor-commits] [tor/release-0.2.8] bump to 0.2.8.7-dev

2016-08-24 Thread nickm
commit e9124b8cc76e247ea2a581b33af942729e250b8d
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:08 2016 -0400

bump to 0.2.8.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6918868..76080f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7])
+AC_INIT([tor],[0.2.8.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index a603975..1b0c23d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7"
+!define VERSION "0.2.8.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index d13e33c..a3ad9de 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7"
+#define VERSION "0.2.8.7-dev"
 
 
 



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


[tor-commits] [tor/master] bump to 0.2.8.7-dev

2016-08-24 Thread nickm
commit e9124b8cc76e247ea2a581b33af942729e250b8d
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:08 2016 -0400

bump to 0.2.8.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6918868..76080f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7])
+AC_INIT([tor],[0.2.8.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index a603975..1b0c23d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7"
+!define VERSION "0.2.8.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index d13e33c..a3ad9de 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7"
+#define VERSION "0.2.8.7-dev"
 
 
 



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


[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-08-24 Thread nickm
commit 20136a8207f0cda0d23093a884caae0358f98bac
Merge: 7be7f42 e9124b8
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:27 2016 -0400

Merge branch 'maint-0.2.8'

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


[tor-commits] [tor/maint-0.2.8] bump to 0.2.8.7-dev

2016-08-24 Thread nickm
commit e9124b8cc76e247ea2a581b33af942729e250b8d
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:08 2016 -0400

bump to 0.2.8.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6918868..76080f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.7])
+AC_INIT([tor],[0.2.8.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index a603975..1b0c23d 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.7"
+!define VERSION "0.2.8.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index d13e33c..a3ad9de 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.7"
+#define VERSION "0.2.8.7-dev"
 
 
 

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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-08-24 Thread nickm
commit 06b9f75f3ee435c8bfe5148ffb13f7c0e23d8af3
Merge: 2630886 e9124b8
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:13 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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


[tor-commits] [tor/master] bump to 0.2.9.2-alpha-dev

2016-08-24 Thread nickm
commit 7be7f42d459bc95c3451cb2a5393b8b6d1123eeb
Author: Nick Mathewson 
Date:   Wed Aug 24 14:45:33 2016 -0400

bump to 0.2.9.2-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 19276ea..a90c15c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.2-alpha])
+AC_INIT([tor],[0.2.9.2-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 543a834..9eec555 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.2-alpha"
+!define VERSION "0.2.9.2-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index fb5343c..1e1c31d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.2-alpha"
+#define VERSION "0.2.9.2-alpha-dev"
 
 
 

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


[tor-commits] [webwml/master] Bump tor versions

2016-08-24 Thread nickm
commit d3797b35bfa6432a80d36f15521f80a64759a6f2
Author: Nick Mathewson 
Date:   Wed Aug 24 14:45:04 2016 -0400

Bump tor versions
---
 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5a2b240..95cfa50 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.8.6
-export DEVTAG=tor-0.2.9.1-alpha
+export STABLETAG=tor-0.2.8.7
+export DEVTAG=tor-0.2.9.2-alpha
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 46ec6c0..94a086d 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.2.8.6
-0.2.9.1-alpha
+0.2.8.7
+0.2.9.2-alpha
 
 0.2.8.6
 

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


[tor-commits] [tor/master] forward-port the 0.2.8.7 changelog

2016-08-24 Thread arma
commit 00ec701f8343f5523de52d10b19fe637609f735e
Author: Roger Dingledine 
Date:   Wed Aug 24 13:59:15 2016 -0400

forward-port the 0.2.8.7 changelog
---
 ChangeLog | 32 
 1 file changed, 32 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8fbda5a..d273b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,38 @@ Changes in version 0.2.9.2-alpha - 2016-08-24
   Tor. Closes ticket 19450. Based on a patch from U+039b.
 
 
+Changes in version 0.2.8.7 - 2016-08-24
+  Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
+  option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
+  who sets the ReachableAddresses option, and all bridges, are strongly
+  encouraged to upgrade.
+
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. In earlier versions of 0.2.8.x, it would apply to
+  every hop in the path, with a possible degradation in anonymity
+  for anyone using an uncommon ReachableAddress setting. Fixes bug
+  19973; bugfix on 0.2.8.2-alpha.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation):
+- Remove an inappropriate "inline" in tortls.c that was causing
+  warnings on older versions of GCC. Fixes bug 19903; bugfix
+  on 0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback
+  directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+  and 0.2.8.1-alpha. Report and patch by "rubiate".
+
+
 Changes in version 0.2.9.1-alpha - 2016-08-08
   Tor 0.2.9.1-alpha is the first alpha release in the 0.2.9 development
   series. It improves our support for hardened builds and compiler

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


[tor-commits] [tor/master] and also make that fix in the ReleaseNotes

2016-08-24 Thread arma
commit 6cdae7f8fed8ec0c02f74e7afb297ac6b291c2d8
Author: Roger Dingledine 
Date:   Wed Aug 24 13:59:03 2016 -0400

and also make that fix in the ReleaseNotes
---
 ReleaseNotes | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index fa03443..ba988ff 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -14,10 +14,10 @@ Changes in version 0.2.8.7 - 2016-08-24
 
   o Major bugfixes (client, security):
 - Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
-  on 0.2.8.2-alpha.
+  in a path. In earlier versions of 0.2.8.x, it would apply to
+  every hop in the path, with a possible degradation in anonymity
+  for anyone using an uncommon ReachableAddress setting. Fixes bug
+  19973; bugfix on 0.2.8.2-alpha.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2



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


[tor-commits] [tor/master] fix typo and possible confusion in changelog entry

2016-08-24 Thread arma
commit 5e864b285e4338d18b52b5d6530360a8593bde77
Author: Roger Dingledine 
Date:   Wed Aug 24 13:57:31 2016 -0400

fix typo and possible confusion in changelog entry
---
 ChangeLog | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 153dc40..8fbda5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,10 +11,10 @@ Changes in version 0.2.9.2-alpha - 2016-08-24
 
   o Major bugfixes (client, security, also in 0.2.8.7):
 - Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
-  on 0.2.8.2-alpha.
+  in a path. In earlier versions of 0.2.8.x, it would apply to
+  every hop in the path, with a possible degradation in anonymity
+  for anyone using an uncommon ReachableAddress setting. Fixes bug
+  19973; bugfix on 0.2.8.2-alpha.
 
   o Major features (user interface):
 - Tor now supports the ability to declare options deprecated, so

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


[tor-commits] [tor/release-0.2.8] fix typo and possible confusion in changelog entry

2016-08-24 Thread arma
commit 263088633a63982a8d6ddffd3ed3e3d85cffd6f1
Author: Roger Dingledine 
Date:   Wed Aug 24 13:55:35 2016 -0400

fix typo and possible confusion in changelog entry
---
 ChangeLog| 8 
 ReleaseNotes | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 525cae5..cbf818b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,10 +10,10 @@ Changes in version 0.2.8.7 - 2016-08-24
 
   o Major bugfixes (client, security):
 - Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
-  on 0.2.8.2-alpha.
+  in a path. In earlier versions of 0.2.8.x, it would apply to
+  every hop in the path, with a possible degradation in anonymity
+  for anyone using an uncommon ReachableAddress setting. Fixes bug
+  19973; bugfix on 0.2.8.2-alpha.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
diff --git a/ReleaseNotes b/ReleaseNotes
index fdc8c78..9f9f518 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -14,10 +14,10 @@ Changes in version 0.2.8.7 - 2016-08-24
 
   o Major bugfixes (client, security):
 - Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
-  on 0.2.8.2-alpha.
+  in a path. In earlier versions of 0.2.8.x, it would apply to
+  every hop in the path, with a possible degradation in anonymity
+  for anyone using an uncommon ReachableAddress setting. Fixes bug
+  19973; bugfix on 0.2.8.2-alpha.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2

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


[tor-commits] [tor/master] make check-spaces fixes

2016-08-24 Thread nickm
commit 10f86071253851a59cf70c09f3036b9fa73b83db
Author: Nick Mathewson 
Date:   Wed Aug 24 13:39:22 2016 -0400

make check-spaces fixes
---
 src/or/config.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 1b64676..541025d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6899,7 +6899,8 @@ parse_ports(or_options_t *options, int validate_only,
 }
 
 /* Does port bind to IPv4? */
-static int port_binds_ipv4(const port_cfg_t *port)
+static int
+port_binds_ipv4(const port_cfg_t *port)
 {
   return tor_addr_family(&port->addr) == AF_INET ||
  (tor_addr_family(&port->addr) == AF_UNSPEC
@@ -6907,7 +6908,8 @@ static int port_binds_ipv4(const port_cfg_t *port)
 }
 
 /* Does port bind to IPv6? */
-static int port_binds_ipv6(const port_cfg_t *port)
+static int
+port_binds_ipv6(const port_cfg_t *port)
 {
   return tor_addr_family(&port->addr) == AF_INET6 ||
  (tor_addr_family(&port->addr) == AF_UNSPEC

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


[tor-commits] [tor/release-0.2.8] Roger points out that most people do not set UpdateBridgesFromAuthority

2016-08-24 Thread nickm
commit 84b8131826e19e49107e3cb016a79cae41af1181
Author: Nick Mathewson 
Date:   Wed Aug 24 13:37:52 2016 -0400

Roger points out that most people do not set UpdateBridgesFromAuthority
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27f9974..525cae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 Changes in version 0.2.8.7 - 2016-08-24
   Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
   option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
-  who sets the ReachableAddresses option, all bridges, and all bridge
-  users are strongly encouraged to upgrade.
+  who sets the ReachableAddresses option, and all bridges, are strongly
+  encouraged to upgrade.
 
   o Directory authority changes:
 - The "Tonga" bridge authority has been retired; the new bridge



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


[tor-commits] [tor/master] ReleaseNotes update

2016-08-24 Thread nickm
commit 5c0deff93b1b62f12d48aad7d1b02fcb1752dc06
Author: Nick Mathewson 
Date:   Wed Aug 24 13:38:33 2016 -0400

ReleaseNotes update
---
 ReleaseNotes | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 35ddcf8..fa03443 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,37 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.8.7 - 2016-08-24
+  Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
+  option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
+  who sets the ReachableAddresses option, and all bridges, are strongly
+  encouraged to upgrade.
+
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
+  on 0.2.8.2-alpha.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation):
+- Remove an inappropriate "inline" in tortls.c that was causing
+  warnings on older versions of GCC. Fixes bug 19903; bugfix
+  on 0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback
+  directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+  and 0.2.8.1-alpha. Report and patch by "rubiate".
+
 
 Changes in version 0.2.8.6 - 2016-08-02
 

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


[tor-commits] [tor/release-0.2.8] ReleaseNotes update

2016-08-24 Thread nickm
commit ffa90d814232cfe704c42a9e85f71f84779459b1
Author: Nick Mathewson 
Date:   Wed Aug 24 13:38:30 2016 -0400

ReleaseNotes update
---
 ReleaseNotes | 32 
 1 file changed, 32 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index cb1c128..fdc8c78 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,38 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.8.7 - 2016-08-24
+  Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
+  option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
+  who sets the ReachableAddresses option, and all bridges, are strongly
+  encouraged to upgrade.
+
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
+  on 0.2.8.2-alpha.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation):
+- Remove an inappropriate "inline" in tortls.c that was causing
+  warnings on older versions of GCC. Fixes bug 19903; bugfix
+  on 0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback
+  directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+  and 0.2.8.1-alpha. Report and patch by "rubiate".
+
+
 Changes in version 0.2.8.6 - 2016-08-02
 
   Tor 0.2.8.6 is the first stable version of the Tor 0.2.8 series.

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


[tor-commits] [tor/master] Roger points out that most people do not set UpdateBridgesFromAuthority

2016-08-24 Thread nickm
commit 14074f15fe9030b6f4327a9fd5d156404ccb76b7
Author: Nick Mathewson 
Date:   Wed Aug 24 13:37:47 2016 -0400

Roger points out that most people do not set UpdateBridgesFromAuthority
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 63f8817..153dc40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@ Changes in version 0.2.9.2-alpha - 2016-08-24
   Tor 0.2.9.2-alpha continues development of the 0.2.9 series with
   several new features and bugfixes. It also includes an important
   authority update and an important bugfix from 0.2.8.7. Everyone who
-  sets the ReachableAddresses option, all bridges, and all bridge users
-  are strongly encouraged to upgrade to 0.2.8.7, or to 0.2.9.2-alpha.
+  sets the ReachableAddresses option, and all bridges, are strongly
+  encouraged to upgrade to 0.2.8.7, or to 0.2.9.2-alpha.
 
   o Directory authority changes (also in 0.2.8.7):
 - The "Tonga" bridge authority has been retired; the new bridge



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


[tor-commits] [tor-messenger-build/master] Back out some of a82a7c1b

2016-08-24 Thread arlo
commit b5cf475df1ddbeef1fd4db91001250f504600a6c
Author: Arlo Breault 
Date:   Wed Aug 24 10:03:03 2016 -0700

Back out some of a82a7c1b

 * libgpg-error bump is breaking osx.
---
 ChangeLog| 1 -
 projects/libgpg-error/config | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dc9198..497bb35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,6 @@ Tor Messenger 0.1.0b7 --
* Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45
* Bug 14388: Port Tor Browser's updater patches
* Bug 19053: Display plaintext in notifications
-   * Update libgpg-error to 1.24
* Update libgcrypt to 1.6.6 for CVE-2016-6316
* ctypes-otr
  * GH 66: Provide functionality for adding verified fingerprints (patch by 
Vu Quoc Huy)
diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config
index ed98a5e..48c10be 100644
--- a/projects/libgpg-error/config
+++ b/projects/libgpg-error/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
-version: 1.24
+version: 1.20
 remote_docker: 1
 var:
   deps:

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


[tor-commits] [tor/release-0.2.8] Remove duplicate section

2016-08-24 Thread nickm
commit 1cc26c906caf09ae8561564ae68a05747cd22795
Author: Nick Mathewson 
Date:   Wed Aug 24 11:11:00 2016 -0400

Remove duplicate section
---
 ChangeLog | 4 
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1da6396..27f9974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,10 +29,6 @@ Changes in version 0.2.8.7 - 2016-08-24
   directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
   and 0.2.8.1-alpha. Report and patch by "rubiate".
 
-  o Directory authority changes:
-- The "Tonga" bridge authority has been retired; the new bridge
-  authority is "Bifroest". Closes tickets 19728 and 19690.
-
 
 Changes in version 0.2.8.6 - 2016-08-02
 

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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-08-24 Thread nickm
commit 82957bf91ae6326b82fb3bb5ce8107f64c2d41ae
Merge: 46e2c15 57ba7ab
Author: Nick Mathewson 
Date:   Wed Aug 24 11:02:17 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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


[tor-commits] [tor/release-0.2.8] Bump to 0.2.8.7

2016-08-24 Thread nickm
commit 57ba7ab39a31e48b4a865a7e207237474f561905
Author: Nick Mathewson 
Date:   Wed Aug 24 11:01:57 2016 -0400

Bump to 0.2.8.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4658b3a..6918868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.6-dev])
+AC_INIT([tor],[0.2.8.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e146694..a603975 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.6-dev"
+!define VERSION "0.2.8.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index af4cba2..d13e33c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.6-dev"
+#define VERSION "0.2.8.7"
 
 
 



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


[tor-commits] [tor/release-0.2.8] Fold the last (I hope) two changes into the changelog

2016-08-24 Thread nickm
commit 619507a029e5c5bfdb353130451ae22a9cb423d8
Author: Nick Mathewson 
Date:   Wed Aug 24 10:50:47 2016 -0400

Fold the last (I hope) two changes into the changelog
---
 ChangeLog| 18 +++---
 changes/bug19728 |  3 ---
 changes/bug19973 |  6 --
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2151173..9c80344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
 Changes in version 0.2.8.7 - 2016-08-2?
-  Tor 0.2.8.7 fixes a few bugs still present in 0.2.8.6, and replaces a
-  retiring bridge authority. All bridges and bridge users are strongly
-  encouraged to upgrade.
+  Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
+  option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
+  who sets the ReachableAddresses option, all bridges, and all bridge
+  users are strongly encouraged to upgrade.
+
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
+  on 0.2.8.2-alpha.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
@@ -17,6 +25,10 @@ Changes in version 0.2.8.7 - 2016-08-2?
   directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
   and 0.2.8.1-alpha. Report and patch by "rubiate".
 
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
 
 Changes in version 0.2.8.6 - 2016-08-02
 
diff --git a/changes/bug19728 b/changes/bug19728
deleted file mode 100644
index 98ba342..000
--- a/changes/bug19728
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-- The "Tonga" bridge authority has been retired; the new bridge
-  authority is "Bifroest". Closes tickets 19728 and 19690.
diff --git a/changes/bug19973 b/changes/bug19973
deleted file mode 100644
index 7bd5c55..000
--- a/changes/bug19973
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (client, security):
-- Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
-  0.2.8.2-alpha.



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


[tor-commits] [tor/release-0.2.8] missed one

2016-08-24 Thread nickm
commit 46e2c15e2fe5b8c7963bee0e651003b03603b1df
Author: Nick Mathewson 
Date:   Wed Aug 24 10:56:39 2016 -0400

missed one
---
 ChangeLog | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9c80344..1da6396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
-Changes in version 0.2.8.7 - 2016-08-2?
+Changes in version 0.2.8.7 - 2016-08-24
   Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
   option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
   who sets the ReachableAddresses option, all bridges, and all bridge
   users are strongly encouraged to upgrade.
 
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
   o Major bugfixes (client, security):
 - Only use the ReachableAddresses option to restrict the first hop
   in a path. Previously, it would apply to every hop in the path,



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


[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-08-24 Thread nickm
commit 7d410a6b0d462e0838c5fca2eec089693104a514
Merge: e2ede7c 57ba7ab
Author: Nick Mathewson 
Date:   Wed Aug 24 11:02:10 2016 -0400

Merge branch 'maint-0.2.8'

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


[tor-commits] [tor/master] Add last two entries (I hope) to 0292-alpha changelog

2016-08-24 Thread nickm
commit 93731d6e37ca3e66c66204e187ce932ba1219e80
Author: Nick Mathewson 
Date:   Wed Aug 24 10:57:47 2016 -0400

Add last two entries (I hope) to 0292-alpha changelog
---
 ChangeLog| 19 +--
 changes/bug19728 |  3 ---
 changes/bug19973 |  6 --
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f20d0a..63f8817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
-Changes in version 0.2.9.2-alpha - 2016-08-2?
-  Tor 0.2.9.2-alpha  BLURB HERE.
+Changes in version 0.2.9.2-alpha - 2016-08-24
+  Tor 0.2.9.2-alpha continues development of the 0.2.9 series with
+  several new features and bugfixes. It also includes an important
+  authority update and an important bugfix from 0.2.8.7. Everyone who
+  sets the ReachableAddresses option, all bridges, and all bridge users
+  are strongly encouraged to upgrade to 0.2.8.7, or to 0.2.9.2-alpha.
+
+  o Directory authority changes (also in 0.2.8.7):
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.
+
+  o Major bugfixes (client, security, also in 0.2.8.7):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix
+  on 0.2.8.2-alpha.
 
   o Major features (user interface):
 - Tor now supports the ability to declare options deprecated, so
diff --git a/changes/bug19728 b/changes/bug19728
deleted file mode 100644
index 98ba342..000
--- a/changes/bug19728
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-- The "Tonga" bridge authority has been retired; the new bridge
-  authority is "Bifroest". Closes tickets 19728 and 19690.
diff --git a/changes/bug19973 b/changes/bug19973
deleted file mode 100644
index 7bd5c55..000
--- a/changes/bug19973
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (client, security):
-- Only use the ReachableAddresses option to restrict the first hop
-  in a path. Previously, it would apply to every hop in the path,
-  with a possible degredation in anonymity for anyone using an
-  uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
-  0.2.8.2-alpha.



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


[tor-commits] [tor/maint-0.2.8] Bump to 0.2.8.7

2016-08-24 Thread nickm
commit 57ba7ab39a31e48b4a865a7e207237474f561905
Author: Nick Mathewson 
Date:   Wed Aug 24 11:01:57 2016 -0400

Bump to 0.2.8.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4658b3a..6918868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.6-dev])
+AC_INIT([tor],[0.2.8.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e146694..a603975 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.6-dev"
+!define VERSION "0.2.8.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index af4cba2..d13e33c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.6-dev"
+#define VERSION "0.2.8.7"
 
 
 

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


[tor-commits] [tor/master] Bump to 0.2.8.7

2016-08-24 Thread nickm
commit 57ba7ab39a31e48b4a865a7e207237474f561905
Author: Nick Mathewson 
Date:   Wed Aug 24 11:01:57 2016 -0400

Bump to 0.2.8.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4658b3a..6918868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.6-dev])
+AC_INIT([tor],[0.2.8.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e146694..a603975 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.6-dev"
+!define VERSION "0.2.8.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index af4cba2..d13e33c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.6-dev"
+#define VERSION "0.2.8.7"
 
 
 



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


[tor-commits] [tor/master] Bump to 0.2.9.2-alpha

2016-08-24 Thread nickm
commit e2ede7c9d5944c87eb4022eae0090cdfac2202b9
Author: Nick Mathewson 
Date:   Wed Aug 24 11:01:33 2016 -0400

Bump to 0.2.9.2-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 42cbfd0..19276ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.1-alpha-dev])
+AC_INIT([tor],[0.2.9.2-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 81ff86c..543a834 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.1-alpha-dev"
+!define VERSION "0.2.9.2-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4b4b3c5..fb5343c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.1-alpha-dev"
+#define VERSION "0.2.9.2-alpha"
 
 
 



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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-08-24 Thread nickm
commit 041947977ec9b0b3efc54e10a9fde8f209e0ddad
Merge: 824b160 5280a70
Author: Nick Mathewson 
Date:   Wed Aug 24 10:44:21 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19973  |  6 ++
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

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


[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-08-24 Thread nickm
commit 51329054199e2b7eb3aed46282028f04e13a13ad
Merge: 297635f 5280a70
Author: Nick Mathewson 
Date:   Wed Aug 24 10:45:11 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug19973  |  6 ++
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

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


[tor-commits] [tor/master] Changes file for bug19973

2016-08-24 Thread nickm
commit 5280a700aae934753671d26e75050177b510d30d
Author: Nick Mathewson 
Date:   Wed Aug 24 10:34:00 2016 -0400

Changes file for bug19973
---
 changes/bug19973 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug19973 b/changes/bug19973
new file mode 100644
index 000..7bd5c55
--- /dev/null
+++ b/changes/bug19973
@@ -0,0 +1,6 @@
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
+  0.2.8.2-alpha.



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


[tor-commits] [tor/master] Fix path selection on firewalled clients

2016-08-24 Thread nickm
commit b1ad024d3002e9d8581b6b96c892e5988d9e759b
Author: teor 
Date:   Thu Aug 18 12:02:33 2016 +1000

Fix path selection on firewalled clients

Signed-off-by: teor 
---
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 820724a..28d286c 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1777,6 +1777,8 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   const node_t *rp_node = NULL;
   const int allow_invalid = (flags & CRN_ALLOW_INVALID) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
+  const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *whitelisted_live_rps = smartlist_new();
   smartlist_t *all_live_nodes = smartlist_new();
@@ -1787,7 +1789,9 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   router_add_running_nodes_to_smartlist(all_live_nodes,
 allow_invalid,
 0, 0, 0,
-need_desc, 0);
+need_desc,
+pref_addr,
+direct_conn);
 
   /* Filter all_live_nodes to only add live *and* whitelisted RPs to
* the list whitelisted_live_rps. */
@@ -2155,7 +2159,8 @@ choose_good_entry_server(uint8_t purpose, 
cpath_build_state_t *state)
   const or_options_t *options = get_options();
   /* If possible, choose an entry server with a preferred address,
* otherwise, choose one with an allowed address */
-  router_crn_flags_t flags = CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR;
+  router_crn_flags_t flags = (CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR|
+  CRN_DIRECT_CONN);
   const node_t *node;
 
   if (state && options->UseEntryGuards &&
diff --git a/src/or/or.h b/src/or/or.h
index 2252f38..da84128 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -5255,7 +5255,10 @@ typedef enum {
   CRN_WEIGHT_AS_EXIT = 1<<5,
   CRN_NEED_DESC = 1<<6,
   /* On clients, only provide nodes that satisfy ClientPreferIPv6OR */
-  CRN_PREF_ADDR = 1<<7
+  CRN_PREF_ADDR = 1<<7,
+  /* On clients, only provide nodes that we can connect to directly, based on
+   * our firewall rules */
+  CRN_DIRECT_CONN = 1<<8
 } router_crn_flags_t;
 
 /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c358872..64baf4d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2017,7 +2017,7 @@ void
 router_add_running_nodes_to_smartlist(smartlist_t *sl, int allow_invalid,
   int need_uptime, int need_capacity,
   int need_guard, int need_desc,
-  int pref_addr)
+  int pref_addr, int direct_conn)
 {
   const int check_reach = !router_skip_or_reachability(get_options(),
pref_addr);
@@ -2032,10 +2032,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Choose a node with an OR address that matches the firewall rules */
-if (check_reach && !fascist_firewall_allows_node(node,
- FIREWALL_OR_CONNECTION,
- pref_addr))
+/* Choose a node with an OR address that matches the firewall rules,
+ * if we are making a direct connection */
+if (direct_conn && check_reach &&
+!fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION, pref_addr))
   continue;
 
 smartlist_add(sl, (void *)node);
@@ -2515,6 +2515,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
   const int weight_for_exit = (flags & CRN_WEIGHT_AS_EXIT) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
   const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *sl=smartlist_new(),
 *excludednodes=smartlist_new();
@@ -2540,7 +2541,8 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
 
   router_add_running_nodes_to_smartlist(sl, allow_invalid,
 need_uptime, need_capacity,
-need_guard, need_desc, pref_addr);
+need_guard, need_desc, pref_addr,
+direct_conn);
   log_debug(LD_CIRC,
"We found %d running nodes.",
 smartlist_len(sl));
diff --git a/src/or/routerl

[tor-commits] [tor/release-0.2.8] Changes file for bug19973

2016-08-24 Thread nickm
commit 5280a700aae934753671d26e75050177b510d30d
Author: Nick Mathewson 
Date:   Wed Aug 24 10:34:00 2016 -0400

Changes file for bug19973
---
 changes/bug19973 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug19973 b/changes/bug19973
new file mode 100644
index 000..7bd5c55
--- /dev/null
+++ b/changes/bug19973
@@ -0,0 +1,6 @@
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
+  0.2.8.2-alpha.



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


[tor-commits] [tor/release-0.2.8] Fix path selection on firewalled clients

2016-08-24 Thread nickm
commit b1ad024d3002e9d8581b6b96c892e5988d9e759b
Author: teor 
Date:   Thu Aug 18 12:02:33 2016 +1000

Fix path selection on firewalled clients

Signed-off-by: teor 
---
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 820724a..28d286c 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1777,6 +1777,8 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   const node_t *rp_node = NULL;
   const int allow_invalid = (flags & CRN_ALLOW_INVALID) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
+  const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *whitelisted_live_rps = smartlist_new();
   smartlist_t *all_live_nodes = smartlist_new();
@@ -1787,7 +1789,9 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   router_add_running_nodes_to_smartlist(all_live_nodes,
 allow_invalid,
 0, 0, 0,
-need_desc, 0);
+need_desc,
+pref_addr,
+direct_conn);
 
   /* Filter all_live_nodes to only add live *and* whitelisted RPs to
* the list whitelisted_live_rps. */
@@ -2155,7 +2159,8 @@ choose_good_entry_server(uint8_t purpose, 
cpath_build_state_t *state)
   const or_options_t *options = get_options();
   /* If possible, choose an entry server with a preferred address,
* otherwise, choose one with an allowed address */
-  router_crn_flags_t flags = CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR;
+  router_crn_flags_t flags = (CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR|
+  CRN_DIRECT_CONN);
   const node_t *node;
 
   if (state && options->UseEntryGuards &&
diff --git a/src/or/or.h b/src/or/or.h
index 2252f38..da84128 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -5255,7 +5255,10 @@ typedef enum {
   CRN_WEIGHT_AS_EXIT = 1<<5,
   CRN_NEED_DESC = 1<<6,
   /* On clients, only provide nodes that satisfy ClientPreferIPv6OR */
-  CRN_PREF_ADDR = 1<<7
+  CRN_PREF_ADDR = 1<<7,
+  /* On clients, only provide nodes that we can connect to directly, based on
+   * our firewall rules */
+  CRN_DIRECT_CONN = 1<<8
 } router_crn_flags_t;
 
 /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c358872..64baf4d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2017,7 +2017,7 @@ void
 router_add_running_nodes_to_smartlist(smartlist_t *sl, int allow_invalid,
   int need_uptime, int need_capacity,
   int need_guard, int need_desc,
-  int pref_addr)
+  int pref_addr, int direct_conn)
 {
   const int check_reach = !router_skip_or_reachability(get_options(),
pref_addr);
@@ -2032,10 +2032,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Choose a node with an OR address that matches the firewall rules */
-if (check_reach && !fascist_firewall_allows_node(node,
- FIREWALL_OR_CONNECTION,
- pref_addr))
+/* Choose a node with an OR address that matches the firewall rules,
+ * if we are making a direct connection */
+if (direct_conn && check_reach &&
+!fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION, pref_addr))
   continue;
 
 smartlist_add(sl, (void *)node);
@@ -2515,6 +2515,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
   const int weight_for_exit = (flags & CRN_WEIGHT_AS_EXIT) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
   const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *sl=smartlist_new(),
 *excludednodes=smartlist_new();
@@ -2540,7 +2541,8 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
 
   router_add_running_nodes_to_smartlist(sl, allow_invalid,
 need_uptime, need_capacity,
-need_guard, need_desc, pref_addr);
+need_guard, need_desc, pref_addr,
+direct_conn);
   log_debug(LD_CIRC,
"We found %d running nodes.",
 smartlist_len(sl));
diff --git a/src/or/routerl

[tor-commits] [tor/maint-0.2.8] Fix path selection on firewalled clients

2016-08-24 Thread nickm
commit b1ad024d3002e9d8581b6b96c892e5988d9e759b
Author: teor 
Date:   Thu Aug 18 12:02:33 2016 +1000

Fix path selection on firewalled clients

Signed-off-by: teor 
---
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 820724a..28d286c 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1777,6 +1777,8 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   const node_t *rp_node = NULL;
   const int allow_invalid = (flags & CRN_ALLOW_INVALID) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
+  const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *whitelisted_live_rps = smartlist_new();
   smartlist_t *all_live_nodes = smartlist_new();
@@ -1787,7 +1789,9 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
   router_add_running_nodes_to_smartlist(all_live_nodes,
 allow_invalid,
 0, 0, 0,
-need_desc, 0);
+need_desc,
+pref_addr,
+direct_conn);
 
   /* Filter all_live_nodes to only add live *and* whitelisted RPs to
* the list whitelisted_live_rps. */
@@ -2155,7 +2159,8 @@ choose_good_entry_server(uint8_t purpose, 
cpath_build_state_t *state)
   const or_options_t *options = get_options();
   /* If possible, choose an entry server with a preferred address,
* otherwise, choose one with an allowed address */
-  router_crn_flags_t flags = CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR;
+  router_crn_flags_t flags = (CRN_NEED_GUARD|CRN_NEED_DESC|CRN_PREF_ADDR|
+  CRN_DIRECT_CONN);
   const node_t *node;
 
   if (state && options->UseEntryGuards &&
diff --git a/src/or/or.h b/src/or/or.h
index 2252f38..da84128 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -5255,7 +5255,10 @@ typedef enum {
   CRN_WEIGHT_AS_EXIT = 1<<5,
   CRN_NEED_DESC = 1<<6,
   /* On clients, only provide nodes that satisfy ClientPreferIPv6OR */
-  CRN_PREF_ADDR = 1<<7
+  CRN_PREF_ADDR = 1<<7,
+  /* On clients, only provide nodes that we can connect to directly, based on
+   * our firewall rules */
+  CRN_DIRECT_CONN = 1<<8
 } router_crn_flags_t;
 
 /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c358872..64baf4d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2017,7 +2017,7 @@ void
 router_add_running_nodes_to_smartlist(smartlist_t *sl, int allow_invalid,
   int need_uptime, int need_capacity,
   int need_guard, int need_desc,
-  int pref_addr)
+  int pref_addr, int direct_conn)
 {
   const int check_reach = !router_skip_or_reachability(get_options(),
pref_addr);
@@ -2032,10 +2032,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Choose a node with an OR address that matches the firewall rules */
-if (check_reach && !fascist_firewall_allows_node(node,
- FIREWALL_OR_CONNECTION,
- pref_addr))
+/* Choose a node with an OR address that matches the firewall rules,
+ * if we are making a direct connection */
+if (direct_conn && check_reach &&
+!fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION, pref_addr))
   continue;
 
 smartlist_add(sl, (void *)node);
@@ -2515,6 +2515,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
   const int weight_for_exit = (flags & CRN_WEIGHT_AS_EXIT) != 0;
   const int need_desc = (flags & CRN_NEED_DESC) != 0;
   const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
+  const int direct_conn = (flags & CRN_DIRECT_CONN) != 0;
 
   smartlist_t *sl=smartlist_new(),
 *excludednodes=smartlist_new();
@@ -2540,7 +2541,8 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
 
   router_add_running_nodes_to_smartlist(sl, allow_invalid,
 need_uptime, need_capacity,
-need_guard, need_desc, pref_addr);
+need_guard, need_desc, pref_addr,
+direct_conn);
   log_debug(LD_CIRC,
"We found %d running nodes.",
 smartlist_len(sl));
diff --git a/src/or/routerl

[tor-commits] [tor/maint-0.2.8] Changes file for bug19973

2016-08-24 Thread nickm
commit 5280a700aae934753671d26e75050177b510d30d
Author: Nick Mathewson 
Date:   Wed Aug 24 10:34:00 2016 -0400

Changes file for bug19973
---
 changes/bug19973 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug19973 b/changes/bug19973
new file mode 100644
index 000..7bd5c55
--- /dev/null
+++ b/changes/bug19973
@@ -0,0 +1,6 @@
+  o Major bugfixes (client, security):
+- Only use the ReachableAddresses option to restrict the first hop
+  in a path. Previously, it would apply to every hop in the path,
+  with a possible degredation in anonymity for anyone using an
+  uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
+  0.2.8.2-alpha.

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


[tor-commits] [tor/release-0.2.7] Changes file for bifroest

2016-08-24 Thread nickm
commit f60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:42 2016 -0400

Changes file  for bifroest
---
 changes/bug19728 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug19728 b/changes/bug19728
new file mode 100644
index 000..98ba342
--- /dev/null
+++ b/changes/bug19728
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.



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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-08-24 Thread nickm
commit 46754d608110fce07fb286365b67209b35397194
Merge: d95c280 1410947
Author: Nick Mathewson 
Date:   Fri Aug 12 10:26:48 2016 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-august2016 | 4 +
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 3 files changed, 8582 insertions(+), 6539 deletions(-)



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


[tor-commits] [tor/release-0.2.7] Replace Tonga with Bifroest.

2016-08-24 Thread nickm
commit 41ab23bed598c5110a41932fcf69dd038a08c61d
Author: Isis Lovecruft 
Date:   Tue Aug 23 14:39:40 2016 +

Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0f36738..3094a1d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -869,8 +869,8 @@ static const char *default_authorities[] = {
   "dizum orport=443 "
 "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Tonga orport=443 bridge "
-"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+  "Bifroest orport=443 bridge "
+"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
   "gabelmoo orport=443 "
 "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",



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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-08-24 Thread nickm
commit 742ff2cddbb9676262e1b588206c3ae264f269b8
Merge: 210928f 46754d6
Author: Nick Mathewson 
Date:   Fri Aug 12 10:27:01 2016 -0400

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-august2016 | 4 +
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 3 files changed, 8582 insertions(+), 6539 deletions(-)



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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-08-24 Thread nickm
commit 824b1609313d8e055c2a733da1a0c3b5d6df24af
Merge: fa038eb d3a975e
Author: Nick Mathewson 
Date:   Wed Aug 24 10:03:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-08-24 Thread nickm
commit db372addc8534dc6e4639fe943179943b276b051
Merge: 4d70ed7 742ff2c
Author: Nick Mathewson 
Date:   Fri Aug 12 10:27:08 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-august2016 | 4 +
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 3 files changed, 8582 insertions(+), 6539 deletions(-)



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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7

2016-08-24 Thread nickm
commit 27940979b3b15a7cf27f4a2dc356a3011a1abcec
Merge: 6482535 f60da19
Author: Nick Mathewson 
Date:   Wed Aug 24 10:03:58 2016 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug19728 | 3 +
 changes/geoip-august2016 | 4 +
 changes/geoip-july2016   | 4 +
 src/config/geoip | 17190 +++--
 src/config/geoip6|  1936 +++--
 src/or/config.c  | 4 +-
 6 files changed, 11672 insertions(+), 7469 deletions(-)

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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-08-24 Thread nickm
commit 4d70ed7be097593ab9ef80b52540e49d30baaf03
Merge: 7c25b41 210928f
Author: Nick Mathewson 
Date:   Tue Jul 19 12:32:14 2016 +0200

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-july2016 |4 +
 src/config/geoip   | 4615 +---
 src/config/geoip6  |  982 ---
 3 files changed, 3879 insertions(+), 1722 deletions(-)



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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

2016-08-24 Thread nickm
commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3
Merge: 92891de d95c280
Author: Nick Mathewson 
Date:   Tue Jul 19 12:31:54 2016 +0200

Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-july2016 |4 +
 src/config/geoip   | 4615 +---
 src/config/geoip6  |  982 ---
 3 files changed, 3879 insertions(+), 1722 deletions(-)



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


[tor-commits] [tor/master] Changes file for bifroest

2016-08-24 Thread nickm
commit f60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:42 2016 -0400

Changes file  for bifroest
---
 changes/bug19728 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug19728 b/changes/bug19728
new file mode 100644
index 000..98ba342
--- /dev/null
+++ b/changes/bug19728
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.



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


[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

2016-08-24 Thread nickm
commit d95c2809b39fc45b7c30b0f29284bae7384c7224
Merge: 19078b1 79939c6
Author: Nick Mathewson 
Date:   Tue Jul 19 12:31:20 2016 +0200

Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-july2016 |4 +
 src/config/geoip   | 4615 +---
 src/config/geoip6  |  982 ---
 3 files changed, 3879 insertions(+), 1722 deletions(-)



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


[tor-commits] [tor/release-0.2.8] Replace Tonga with Bifroest.

2016-08-24 Thread nickm
commit 41ab23bed598c5110a41932fcf69dd038a08c61d
Author: Isis Lovecruft 
Date:   Tue Aug 23 14:39:40 2016 +

Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0f36738..3094a1d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -869,8 +869,8 @@ static const char *default_authorities[] = {
   "dizum orport=443 "
 "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Tonga orport=443 bridge "
-"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+  "Bifroest orport=443 bridge "
+"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
   "gabelmoo orport=443 "
 "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",



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


[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-08-24 Thread nickm
commit d3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge: 0ba0531 f60da19
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:52 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 908f098,3094a1d..4b065a0
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -910,11 -869,10 +910,11 @@@ static const char *default_authorities[
"dizum orport=443 "
  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+   "Bifroest orport=443 bridge "
+ "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "

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


[tor-commits] [tor/maint-0.2.8] Changes file for bifroest

2016-08-24 Thread nickm
commit f60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:42 2016 -0400

Changes file  for bifroest
---
 changes/bug19728 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug19728 b/changes/bug19728
new file mode 100644
index 000..98ba342
--- /dev/null
+++ b/changes/bug19728
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.



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


[tor-commits] [tor/master] Replace Tonga with Bifroest.

2016-08-24 Thread nickm
commit 41ab23bed598c5110a41932fcf69dd038a08c61d
Author: Isis Lovecruft 
Date:   Tue Aug 23 14:39:40 2016 +

Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0f36738..3094a1d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -869,8 +869,8 @@ static const char *default_authorities[] = {
   "dizum orport=443 "
 "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Tonga orport=443 bridge "
-"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+  "Bifroest orport=443 bridge "
+"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
   "gabelmoo orport=443 "
 "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",



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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-08-24 Thread nickm
commit d3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge: 0ba0531 f60da19
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:52 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 908f098,3094a1d..4b065a0
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -910,11 -869,10 +910,11 @@@ static const char *default_authorities[
"dizum orport=443 "
  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+   "Bifroest orport=443 bridge "
+ "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "



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


[tor-commits] [tor/maint-0.2.8] Replace Tonga with Bifroest.

2016-08-24 Thread nickm
commit 41ab23bed598c5110a41932fcf69dd038a08c61d
Author: Isis Lovecruft 
Date:   Tue Aug 23 14:39:40 2016 +

Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0f36738..3094a1d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -869,8 +869,8 @@ static const char *default_authorities[] = {
   "dizum orport=443 "
 "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Tonga orport=443 bridge "
-"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+  "Bifroest orport=443 bridge "
+"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
   "gabelmoo orport=443 "
 "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",



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


[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2016-08-24 Thread nickm
commit d3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge: 0ba0531 f60da19
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:52 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 908f098,3094a1d..4b065a0
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -910,11 -869,10 +910,11 @@@ static const char *default_authorities[
"dizum orport=443 "
  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+   "Bifroest orport=443 bridge "
+ "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
"gabelmoo orport=443 "
  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
  "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 "
  "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "



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


[tor-commits] [tor/maint-0.2.7] Changes file for bifroest

2016-08-24 Thread nickm
commit f60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:42 2016 -0400

Changes file  for bifroest
---
 changes/bug19728 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug19728 b/changes/bug19728
new file mode 100644
index 000..98ba342
--- /dev/null
+++ b/changes/bug19728
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.

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


[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-08-24 Thread nickm
commit 297635f806ec4244c4e6e6f093f87d647061d42a
Merge: 8feb301 d3a975e
Author: Nick Mathewson 
Date:   Wed Aug 24 10:03:19 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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


[tor-commits] [tor/maint-0.2.7] Replace Tonga with Bifroest.

2016-08-24 Thread nickm
commit 41ab23bed598c5110a41932fcf69dd038a08c61d
Author: Isis Lovecruft 
Date:   Tue Aug 23 14:39:40 2016 +

Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0f36738..3094a1d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -869,8 +869,8 @@ static const char *default_authorities[] = {
   "dizum orport=443 "
 "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-  "Tonga orport=443 bridge "
-"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+  "Bifroest orport=443 bridge "
+"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
   "gabelmoo orport=443 "
 "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",



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


[tor-commits] [tor/release-0.2.8] Changes file for bifroest

2016-08-24 Thread nickm
commit f60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Author: Nick Mathewson 
Date:   Wed Aug 24 10:02:42 2016 -0400

Changes file  for bifroest
---
 changes/bug19728 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug19728 b/changes/bug19728
new file mode 100644
index 000..98ba342
--- /dev/null
+++ b/changes/bug19728
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- The "Tonga" bridge authority has been retired; the new bridge
+  authority is "Bifroest". Closes tickets 19728 and 19690.



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


[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-24 Thread translation
commit fdaf4b485dad479abf5e4878f6a5457ee4f44dbf
Author: Translation commit bot 
Date:   Wed Aug 24 13:48:04 2016 +

Update translations for tor-messenger-prefsdtd
---
 de/prefs.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/de/prefs.dtd b/de/prefs.dtd
index d981a5d..6ccfa5a 100644
--- a/de/prefs.dtd
+++ b/de/prefs.dtd
@@ -16,7 +16,7 @@
 
 
 
-
-
-
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file

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


[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-24 Thread translation
commit 4a1f5ee27d6077958588701141cb2a999a736cba
Author: Translation commit bot 
Date:   Wed Aug 24 08:18:04 2016 +

Update translations for tor-messenger-prefsdtd
---
 it/prefs.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/it/prefs.dtd b/it/prefs.dtd
index 3f9b3c0..5c16407 100644
--- a/it/prefs.dtd
+++ b/it/prefs.dtd
@@ -13,10 +13,10 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
 
 
\ No newline at end of file

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