[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-23 Thread translation 
commit 4c7bfc7179450709bb262751d492f6fd4e72ba3f
Author: Translation commit bot 
Date:   Fri Aug 24 05:48:57 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 39f2366b7..6fa6d15b2 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -22,14 +22,14 @@
 # Anna e só , 2018
 # Eduardo Addad de Oliveira , 2018
 # Malkon F , 2018
-# hebe camargo , 2018
+# Thiago Dantas , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-19 10:08+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: hebe camargo , 2018\n"
+"Last-Translator: Thiago Dantas , 2018\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1975,6 +1975,9 @@ msgid ""
 " you have extracted Tor Browser in a location that your user has the correct"
 " permissions for."
 msgstr ""
+"Por favor tenha certeza que nenhuma outra instância do Navegador Tor esteja "
+"executando, e que você tenha extraído o Navegador Tor em uma localização 
que"
+" seu usuário tenha permissões corretas."
 
 #: http//localhost/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)

___
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

2018-08-23 Thread translation 
commit 255a4104c32e7229ffc8d76c839d32c4dc1e81c6
Author: Translation commit bot 
Date:   Fri Aug 24 04:16:04 2018 +

Update translations for tails-misc
---
 mr.po | 37 +++--
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/mr.po b/mr.po
index c3f10444d..a995494e7 100644
--- a/mr.po
+++ b/mr.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Chetan Jain , 2018
 # Vikrant Korde , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-16 14:42+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-24 03:54+\n"
+"Last-Translator: Chetan Jain \n"
 "Language-Team: Marathi 
(http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +21,11 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
-msgstr ""
+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:69
 #, python-format
@@ -64,11 +65,11 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "सक्तीचे संचय तयार करा"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
-msgstr ""
+msgstr "इलेक्ट्राममच्या कार्यात 
टिकून राहणे अक्षम आहे"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
@@ -79,27 +80,27 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
-msgstr ""
+msgstr "आपण तरीही Electrum प्रारंभ करू 
इच्छिता?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:63
 #: config/chroot_local-includes/usr/local/bin/liferea:33
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
-msgstr ""
+msgstr "लाँच"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/bin/liferea:32
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
-msgstr ""
+msgstr "निर्गमन"
 
 #: config/chroot_local-includes/usr/local/bin/liferea:18
 msgid "Liferea is deprecated"
-msgstr ""
+msgstr "जीवनरेखा नापसंत आहे"
 
 #: config/chroot_local-includes/usr/local/bin/liferea:19
 msgid "Do you wish to start Liferea anyway?"
-msgstr ""
+msgstr "आपण तरीही जीवनरेखा सुरू 
करू इच्छिता?"
 
 #: config/chroot_local-includes/usr/local/bin/liferea:21
 msgid ""
@@ -109,20 +110,20 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
-msgstr ""
+msgstr "पुन्हा सुरू"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
 msgid "Lock screen"
-msgstr ""
+msgstr "लॉक स्क्रीन"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
-msgstr ""
+msgstr "पॉवर ऑफ"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:22
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
 msgid "Tails"
-msgstr ""
+msgstr "पुच्छ"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:25
 #: 
../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
@@ -131,7 +132,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:35
 msgid "The Amnesic Incognito Live System"
-msgstr ""
+msgstr "अॅमनेसिक गुप्त लाइव्ह 
सिस्टम"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:36
 #, python-format
@@ -142,7 +143,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:54
 msgid "not available"
-msgstr ""
+msgstr "उपलब्ध नाही"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:142
 #, python-brace-format
@@ -159,7 +160,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151
 msgid "Show Log"
-msgstr ""
+msgstr "नोंदी दाखवा"
 
 #:

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-23 Thread translation 
commit afe719578f14ee00aa815f28fc711c002d5a40cf
Author: Translation commit bot 
Date:   Fri Aug 24 01:18:54 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 8deb4c5c6..39f2366b7 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -1824,6 +1824,8 @@ msgid ""
 "The simplest fix is to click on the \"onion menu,\" then click on the "
 "security slider."
 msgstr ""
+"A maneira mais simples de resolver é clicar no \"menu da cebola\", então "
+"clicar no controle deslizante de segurança."
 
 #: http//localhost/tbb/tbb-39/
 #: (content/tbb/tbb-39/contents+en.lrquestion.description)
@@ -1883,7 +1885,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-4/
 #: (content/tbb/tbb-4/contents+en.lrquestion.seo_slug)
 msgid "tor-browser-is-built-from-firefox-why"
-msgstr ""
+msgstr "navegador-tor-é-construído-a-partir-do-firefox-porque"
 
 #: http//localhost/tbb/tbb-40/
 #: (content/tbb/tbb-40/contents+en.lrquestion.title)

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

[tor-commits] [tor/release-0.3.4] Appveyor CI: always use HEAD for the short commit

2018-08-23 Thread nickm 
commit 78049afaa569a95cf1c7cd55c3b24a784ee15e07
Author: teor 
Date:   Tue Jul 31 12:14:40 2018 +1000

Appveyor CI: always use HEAD for the short commit

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 639acc6ce..cfe0afe7a 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -118,10 +118,6 @@ def appveyor_vars():
 ]
 ])
 
-vars.update(
-short_commit=vars["repo_commit"][:10],
-)
-
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
 if vars["repo_tag_name"]:
@@ -129,15 +125,20 @@ def appveyor_vars():
 else:
 BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
+vars.update(head_commit=vars["repo_commit"])
+
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
 if vars["pull_request_number"]:
+vars.update(head_commit=vars["pull_request_head_commit"])
 BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
 COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
 PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
 vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
+vars.update(short_commit=vars["head_commit"][:10])
+
 vars.update(
 build_url=BUILD_FMT.format(**vars),
 branch_detail=BRANCH_FMT.format(**vars),



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

[tor-commits] [tor/master] Appveyor CI: fix some typos

2018-08-23 Thread nickm 
commit 32fb4403e3b7bbc48a57f565c67cedd79e408794
Author: teor 
Date:   Tue Jul 31 11:49:11 2018 +1000

Appveyor CI: fix some typos
---
 scripts/test/appveyor-irc-notify.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index b06534c3f..59514bebe 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -55,7 +55,7 @@ export APPVEYOR_URL=https://ci.appveyor.com
 export APPVEYOR_PROJECT_NAME=tor
 export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=gihub
+export APPVEYOR_REPO_PROVIDER=github
 export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
 export APPVEYOR_BUILD_VERSION=1
@@ -88,7 +88,7 @@ import time
 
 def appveyor_vars():
 """
-Return a dict of key value carfted from appveyor environment variables.
+Return a dict of key value crafted from appveyor environment variables.
 """
 
 vars = dict([



___
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.3.4'

2018-08-23 Thread nickm 
commit 677048fe9fd04363f1709aa9df7596d70fe542d6
Merge: 9323f5d1d d0007db1f
Author: Nick Mathewson 
Date:   Thu Aug 23 20:44:16 2018 -0400

Merge branch 'maint-0.3.4'

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

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit d0007db1f03fab143e0bb376df187a0560682197
Merge: 90f6c590a 78049afaa
Author: Nick Mathewson 
Date:   Thu Aug 23 20:44:06 2018 -0400

Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

 changes/bug26979|  4 ++
 scripts/test/appveyor-irc-notify.py | 83 -
 2 files changed, 59 insertions(+), 28 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.3.4] Appveyor CI: Switch to one URL per line

2018-08-23 Thread nickm 
commit 41570157004bd7d546f29e1298ffd5102272929c
Author: teor 
Date:   Tue Jul 31 11:37:11 2018 +1000

Appveyor CI: Switch to one URL per line

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index f830db4e4..eb4d26ba3 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -27,6 +27,7 @@
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
 #  - generate correct branches and URLs for pull requests
+#  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -155,17 +156,16 @@ def notify():
 messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
-m = u"Build #{build_version} passed. Details: {build_url}"
+messages.append(u"Build #{build_version} passed. Details: 
{build_url}")
 if failure:
-m = u"Build #{build_version} failed. Details: {build_url}"
+messages.append(u"Build #{build_version} failed. Details: 
{build_url}")
 
 if "commit_url" in apvy_vars:
-m += " Commit: {commit_url}"
+messages.append(u"Commit: {commit_url}")
 
 if "pull_url" in apvy_vars:
-m += " Pull: {pull_url}"
+messages.append(u"Pull: {pull_url}")
 
-messages.append(m)
 else:
 messages = sys.argv[3:]
 messages = ' '.join(messages)



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: Fix GitHub provider detection

2018-08-23 Thread nickm 
commit 73d46b76fd885a108674687cc211efd848641bfe
Author: teor 
Date:   Tue Jul 31 11:09:54 2018 +1000

Appveyor CI: Fix GitHub provider detection

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 4ffea5268..297b02b15 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -22,6 +22,9 @@
 #  - Accept UTF-8
 #  - only guess github URLs
 #  - stop using ANSI colors
+#
+# Modified by teor in 2018:
+#  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -110,7 +113,7 @@ def appveyor_vars():
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
-if vars["repo_provider"] == 'github':
+if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 



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

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

2018-08-23 Thread nickm 
commit 5c3998a02773af87a27265bf9e4d936cc07cc9d1
Merge: 1b5c9a580 d0007db1f
Author: Nick Mathewson 
Date:   Thu Aug 23 20:44:16 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug26979|  4 ++
 scripts/test/appveyor-irc-notify.py | 83 -
 2 files changed, 59 insertions(+), 28 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.3.4] Appveyor CI: sort environmental variables

2018-08-23 Thread nickm 
commit 3ecb7125b4bc0f92d5b7e3be13c787d9ea189639
Author: teor 
Date:   Tue Jul 31 11:54:02 2018 +1000

Appveyor CI: sort environmental variables

To avoid future duplicates.
---
 scripts/test/appveyor-irc-notify.py | 40 ++---
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 59514bebe..639acc6ce 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -51,19 +51,19 @@ delineate multiple messages.
 
 
 Example:
-export APPVEYOR_URL=https://ci.appveyor.com
+export APPVEYOR_ACCOUNT_NAME=isislovecruft
+export APPVEYOR_BUILD_VERSION=1
 export APPVEYOR_PROJECT_NAME=tor
-export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
-export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=github
-export APPVEYOR_REPO_BRANCH=repo_branch
+export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
-export APPVEYOR_BUILD_VERSION=1
+export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8
+export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test"
-export APPVEYOR_ACCOUNT_NAME=isislovecruft
-export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
+export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
 export APPVEYOR_REPO_NAME=isislovecruft/tor
+export APPVEYOR_REPO_PROVIDER=github
+export APPVEYOR_URL=https://ci.appveyor.com
 python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} 
{repo_branch} {short_commit} - {repo_commit_author}: 
{repo_commit_message}','Build #{build_version} passed. Details: {build_url} |  
Commit: {commit_url}
 
 See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for 
examples
@@ -96,25 +96,25 @@ def appveyor_vars():
 v.replace('APPVEYOR_', '').lower(),
 os.getenv(v, '').decode('utf-8')
 ) for v in [
-'APPVEYOR_URL',
-'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
-'APPVEYOR_REPO_BRANCH',
-'APPVEYOR_REPO_COMMIT_AUTHOR',
-'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
-'APPVEYOR_REPO_COMMIT_TIMESTAMP',
-'APPVEYOR_REPO_PROVIDER',
+'APPVEYOR_ACCOUNT_NAME',
+'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_PROJECT_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_NUMBER',
 'APPVEYOR_PULL_REQUEST_TITLE',
-'APPVEYOR_BUILD_VERSION',
+'APPVEYOR_REPO_BRANCH',
 'APPVEYOR_REPO_COMMIT',
+'APPVEYOR_REPO_COMMIT_AUTHOR',
+'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
 'APPVEYOR_REPO_COMMIT_MESSAGE',
-'APPVEYOR_ACCOUNT_NAME',
-'APPVEYOR_PULL_REQUEST_NUMBER',
+'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
+'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_REPO_TAG_NAME',
+'APPVEYOR_URL',
 ]
 ])
 



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: Make short commits 10 hexdigits long

2018-08-23 Thread nickm 
commit d8ce84aae4b3b070025bddeb5231147c19ace94d
Author: teor 
Date:   Tue Jul 31 11:10:55 2018 +1000

Appveyor CI: Make short commits 10 hexdigits long

That's what git does for tor.

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 297b02b15..fc2ead164 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -25,6 +25,7 @@
 #
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
+#  - make short commits 10 hexdigits long (that's what git does for tor)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -119,7 +120,7 @@ def appveyor_vars():
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:7],
+short_commit=vars["repo_commit"][:10],
 )
 return vars
 



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: Generate correct branches and URLs for pull requests

2018-08-23 Thread nickm 
commit 6a870c69bb0f191ac95d36ef7ef4038df04da2dd
Author: teor 
Date:   Tue Jul 31 11:12:21 2018 +1000

Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index fc2ead164..f830db4e4 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,6 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
+#  - generate correct branches and URLs for pull requests
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -102,6 +103,9 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_PROJECT_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
 'APPVEYOR_PULL_REQUEST_TITLE',
 'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_REPO_COMMIT',
@@ -112,15 +116,25 @@ def appveyor_vars():
 ]
 ])
 
+vars.update(
+short_commit=vars["repo_commit"][:10],
+)
+
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
-COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
+COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
+if vars["pull_request_number"]:
+BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
+COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
+PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
+vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:10],
+branch_detail=BRANCH_FMT.format(**vars),
 )
 return vars
 
@@ -138,7 +152,7 @@ def notify():
 
 if success or failure:
 messages = []
-messages.append(u"{repo_name} {repo_branch} {short_commit} - 
{repo_commit_author}: {repo_commit_message}")
+messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
 m = u"Build #{build_version} passed. Details: {build_url}"
@@ -147,7 +161,10 @@ def notify():
 
 if "commit_url" in apvy_vars:
 m += " Commit: {commit_url}"
- 
+
+if "pull_url" in apvy_vars:
+m += " Pull: {pull_url}"
+
 messages.append(m)
 else:
 messages = sys.argv[3:]



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

[tor-commits] [tor/master] Appveyor CI: always use HEAD for the short commit

2018-08-23 Thread nickm 
commit 78049afaa569a95cf1c7cd55c3b24a784ee15e07
Author: teor 
Date:   Tue Jul 31 12:14:40 2018 +1000

Appveyor CI: always use HEAD for the short commit

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 639acc6ce..cfe0afe7a 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -118,10 +118,6 @@ def appveyor_vars():
 ]
 ])
 
-vars.update(
-short_commit=vars["repo_commit"][:10],
-)
-
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
 if vars["repo_tag_name"]:
@@ -129,15 +125,20 @@ def appveyor_vars():
 else:
 BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
+vars.update(head_commit=vars["repo_commit"])
+
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
 if vars["pull_request_number"]:
+vars.update(head_commit=vars["pull_request_head_commit"])
 BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
 COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
 PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
 vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
+vars.update(short_commit=vars["head_commit"][:10])
+
 vars.update(
 build_url=BUILD_FMT.format(**vars),
 branch_detail=BRANCH_FMT.format(**vars),



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

[tor-commits] [tor/master] Appveyor CI: sort environmental variables

2018-08-23 Thread nickm 
commit 3ecb7125b4bc0f92d5b7e3be13c787d9ea189639
Author: teor 
Date:   Tue Jul 31 11:54:02 2018 +1000

Appveyor CI: sort environmental variables

To avoid future duplicates.
---
 scripts/test/appveyor-irc-notify.py | 40 ++---
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 59514bebe..639acc6ce 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -51,19 +51,19 @@ delineate multiple messages.
 
 
 Example:
-export APPVEYOR_URL=https://ci.appveyor.com
+export APPVEYOR_ACCOUNT_NAME=isislovecruft
+export APPVEYOR_BUILD_VERSION=1
 export APPVEYOR_PROJECT_NAME=tor
-export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
-export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=github
-export APPVEYOR_REPO_BRANCH=repo_branch
+export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
-export APPVEYOR_BUILD_VERSION=1
+export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8
+export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test"
-export APPVEYOR_ACCOUNT_NAME=isislovecruft
-export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
+export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
 export APPVEYOR_REPO_NAME=isislovecruft/tor
+export APPVEYOR_REPO_PROVIDER=github
+export APPVEYOR_URL=https://ci.appveyor.com
 python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} 
{repo_branch} {short_commit} - {repo_commit_author}: 
{repo_commit_message}','Build #{build_version} passed. Details: {build_url} |  
Commit: {commit_url}
 
 See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for 
examples
@@ -96,25 +96,25 @@ def appveyor_vars():
 v.replace('APPVEYOR_', '').lower(),
 os.getenv(v, '').decode('utf-8')
 ) for v in [
-'APPVEYOR_URL',
-'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
-'APPVEYOR_REPO_BRANCH',
-'APPVEYOR_REPO_COMMIT_AUTHOR',
-'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
-'APPVEYOR_REPO_COMMIT_TIMESTAMP',
-'APPVEYOR_REPO_PROVIDER',
+'APPVEYOR_ACCOUNT_NAME',
+'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_PROJECT_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_NUMBER',
 'APPVEYOR_PULL_REQUEST_TITLE',
-'APPVEYOR_BUILD_VERSION',
+'APPVEYOR_REPO_BRANCH',
 'APPVEYOR_REPO_COMMIT',
+'APPVEYOR_REPO_COMMIT_AUTHOR',
+'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
 'APPVEYOR_REPO_COMMIT_MESSAGE',
-'APPVEYOR_ACCOUNT_NAME',
-'APPVEYOR_PULL_REQUEST_NUMBER',
+'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
+'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_REPO_TAG_NAME',
+'APPVEYOR_URL',
 ]
 ])
 



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: fix some typos

2018-08-23 Thread nickm 
commit 32fb4403e3b7bbc48a57f565c67cedd79e408794
Author: teor 
Date:   Tue Jul 31 11:49:11 2018 +1000

Appveyor CI: fix some typos
---
 scripts/test/appveyor-irc-notify.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index b06534c3f..59514bebe 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -55,7 +55,7 @@ export APPVEYOR_URL=https://ci.appveyor.com
 export APPVEYOR_PROJECT_NAME=tor
 export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=gihub
+export APPVEYOR_REPO_PROVIDER=github
 export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
 export APPVEYOR_BUILD_VERSION=1
@@ -88,7 +88,7 @@ import time
 
 def appveyor_vars():
 """
-Return a dict of key value carfted from appveyor environment variables.
+Return a dict of key value crafted from appveyor environment variables.
 """
 
 vars = dict([



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

[tor-commits] [tor/master] Appveyor CI: Changes file for 26979

2018-08-23 Thread nickm 
commit 842509171830406d03f35383c71b57f1264dedb0
Author: teor 
Date:   Tue Jul 31 11:58:04 2018 +1000

Appveyor CI: Changes file for 26979

Closes 26979.
---
 changes/bug26979 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug26979 b/changes/bug26979
new file mode 100644
index 0..e615207b7
--- /dev/null
+++ b/changes/bug26979
@@ -0,0 +1,4 @@
+  o Minor bugfixes (appveyor ci):
+- Improve Appveyor CI IRC logging. Generate correct branches and URLs for
+  pull requests and tags. Use unambiguous short commits.
+  Fixes bug 26979; bugfix on master.



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit d0007db1f03fab143e0bb376df187a0560682197
Merge: 90f6c590a 78049afaa
Author: Nick Mathewson 
Date:   Thu Aug 23 20:44:06 2018 -0400

Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

 changes/bug26979|  4 ++
 scripts/test/appveyor-irc-notify.py | 83 -
 2 files changed, 59 insertions(+), 28 deletions(-)



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

[tor-commits] [tor/master] Appveyor CI: Generate correct branches and URLs for pull requests

2018-08-23 Thread nickm 
commit 6a870c69bb0f191ac95d36ef7ef4038df04da2dd
Author: teor 
Date:   Tue Jul 31 11:12:21 2018 +1000

Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index fc2ead164..f830db4e4 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,6 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
+#  - generate correct branches and URLs for pull requests
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -102,6 +103,9 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_PROJECT_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
 'APPVEYOR_PULL_REQUEST_TITLE',
 'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_REPO_COMMIT',
@@ -112,15 +116,25 @@ def appveyor_vars():
 ]
 ])
 
+vars.update(
+short_commit=vars["repo_commit"][:10],
+)
+
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
-COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
+COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
+if vars["pull_request_number"]:
+BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
+COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
+PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
+vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:10],
+branch_detail=BRANCH_FMT.format(**vars),
 )
 return vars
 
@@ -138,7 +152,7 @@ def notify():
 
 if success or failure:
 messages = []
-messages.append(u"{repo_name} {repo_branch} {short_commit} - 
{repo_commit_author}: {repo_commit_message}")
+messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
 m = u"Build #{build_version} passed. Details: {build_url}"
@@ -147,7 +161,10 @@ def notify():
 
 if "commit_url" in apvy_vars:
 m += " Commit: {commit_url}"
- 
+
+if "pull_url" in apvy_vars:
+m += " Pull: {pull_url}"
+
 messages.append(m)
 else:
 messages = sys.argv[3:]



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: Changes file for 26979

2018-08-23 Thread nickm 
commit 842509171830406d03f35383c71b57f1264dedb0
Author: teor 
Date:   Tue Jul 31 11:58:04 2018 +1000

Appveyor CI: Changes file for 26979

Closes 26979.
---
 changes/bug26979 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug26979 b/changes/bug26979
new file mode 100644
index 0..e615207b7
--- /dev/null
+++ b/changes/bug26979
@@ -0,0 +1,4 @@
+  o Minor bugfixes (appveyor ci):
+- Improve Appveyor CI IRC logging. Generate correct branches and URLs for
+  pull requests and tags. Use unambiguous short commits.
+  Fixes bug 26979; bugfix on master.



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

[tor-commits] [tor/release-0.3.4] Appveyor CI: Generate correct tag names

2018-08-23 Thread nickm 
commit 965a910abf62523e72c50f216fba15b1395fc03d
Author: teor 
Date:   Tue Jul 31 11:47:33 2018 +1000

Appveyor CI: Generate correct tag names

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index eb4d26ba3..b06534c3f 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,7 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
-#  - generate correct branches and URLs for pull requests
+#  - generate correct branches and URLs for pull requests and tags
 #  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
@@ -113,7 +113,8 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_MESSAGE',
 'APPVEYOR_ACCOUNT_NAME',
 'APPVEYOR_PULL_REQUEST_NUMBER',
-'APPVEYOR_REPO_NAME'
+'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_TAG_NAME',
 ]
 ])
 
@@ -122,7 +123,11 @@ def appveyor_vars():
 )
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
-BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
+
+if vars["repo_tag_name"]:
+BRANCH_FMT = u'{repo_name} {repo_tag_name} {short_commit}'
+else:
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: always use HEAD for the short commit

2018-08-23 Thread nickm 
commit 78049afaa569a95cf1c7cd55c3b24a784ee15e07
Author: teor 
Date:   Tue Jul 31 12:14:40 2018 +1000

Appveyor CI: always use HEAD for the short commit

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 639acc6ce..cfe0afe7a 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -118,10 +118,6 @@ def appveyor_vars():
 ]
 ])
 
-vars.update(
-short_commit=vars["repo_commit"][:10],
-)
-
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
 if vars["repo_tag_name"]:
@@ -129,15 +125,20 @@ def appveyor_vars():
 else:
 BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
+vars.update(head_commit=vars["repo_commit"])
+
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
 if vars["pull_request_number"]:
+vars.update(head_commit=vars["pull_request_head_commit"])
 BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
 COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
 PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
 vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
+vars.update(short_commit=vars["head_commit"][:10])
+
 vars.update(
 build_url=BUILD_FMT.format(**vars),
 branch_detail=BRANCH_FMT.format(**vars),



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

[tor-commits] [tor/master] Appveyor CI: Switch to one URL per line

2018-08-23 Thread nickm 
commit 41570157004bd7d546f29e1298ffd5102272929c
Author: teor 
Date:   Tue Jul 31 11:37:11 2018 +1000

Appveyor CI: Switch to one URL per line

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index f830db4e4..eb4d26ba3 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -27,6 +27,7 @@
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
 #  - generate correct branches and URLs for pull requests
+#  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -155,17 +156,16 @@ def notify():
 messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
-m = u"Build #{build_version} passed. Details: {build_url}"
+messages.append(u"Build #{build_version} passed. Details: 
{build_url}")
 if failure:
-m = u"Build #{build_version} failed. Details: {build_url}"
+messages.append(u"Build #{build_version} failed. Details: 
{build_url}")
 
 if "commit_url" in apvy_vars:
-m += " Commit: {commit_url}"
+messages.append(u"Commit: {commit_url}")
 
 if "pull_url" in apvy_vars:
-m += " Pull: {pull_url}"
+messages.append(u"Pull: {pull_url}")
 
-messages.append(m)
 else:
 messages = sys.argv[3:]
 messages = ' '.join(messages)



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: Generate correct branches and URLs for pull requests

2018-08-23 Thread nickm 
commit 6a870c69bb0f191ac95d36ef7ef4038df04da2dd
Author: teor 
Date:   Tue Jul 31 11:12:21 2018 +1000

Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index fc2ead164..f830db4e4 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,6 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
+#  - generate correct branches and URLs for pull requests
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -102,6 +103,9 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_PROJECT_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
 'APPVEYOR_PULL_REQUEST_TITLE',
 'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_REPO_COMMIT',
@@ -112,15 +116,25 @@ def appveyor_vars():
 ]
 ])
 
+vars.update(
+short_commit=vars["repo_commit"][:10],
+)
+
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
-COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
+COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
+if vars["pull_request_number"]:
+BRANCH_FMT = u'{repo_name} {repo_branch} pull 
{pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
+COMMIT_FMT = 
u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
+PULL_FMT = 
u'https://github.com/{repo_name}/pull/{pull_request_number}'
+vars.update(pull_url=PULL_FMT.format(**vars))
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:10],
+branch_detail=BRANCH_FMT.format(**vars),
 )
 return vars
 
@@ -138,7 +152,7 @@ def notify():
 
 if success or failure:
 messages = []
-messages.append(u"{repo_name} {repo_branch} {short_commit} - 
{repo_commit_author}: {repo_commit_message}")
+messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
 m = u"Build #{build_version} passed. Details: {build_url}"
@@ -147,7 +161,10 @@ def notify():
 
 if "commit_url" in apvy_vars:
 m += " Commit: {commit_url}"
- 
+
+if "pull_url" in apvy_vars:
+m += " Pull: {pull_url}"
+
 messages.append(m)
 else:
 messages = sys.argv[3:]



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

[tor-commits] [tor/master] Appveyor CI: Generate correct tag names

2018-08-23 Thread nickm 
commit 965a910abf62523e72c50f216fba15b1395fc03d
Author: teor 
Date:   Tue Jul 31 11:47:33 2018 +1000

Appveyor CI: Generate correct tag names

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index eb4d26ba3..b06534c3f 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,7 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
-#  - generate correct branches and URLs for pull requests
+#  - generate correct branches and URLs for pull requests and tags
 #  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
@@ -113,7 +113,8 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_MESSAGE',
 'APPVEYOR_ACCOUNT_NAME',
 'APPVEYOR_PULL_REQUEST_NUMBER',
-'APPVEYOR_REPO_NAME'
+'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_TAG_NAME',
 ]
 ])
 
@@ -122,7 +123,11 @@ def appveyor_vars():
 )
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
-BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
+
+if vars["repo_tag_name"]:
+BRANCH_FMT = u'{repo_name} {repo_tag_name} {short_commit}'
+else:
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: fix some typos

2018-08-23 Thread nickm 
commit 32fb4403e3b7bbc48a57f565c67cedd79e408794
Author: teor 
Date:   Tue Jul 31 11:49:11 2018 +1000

Appveyor CI: fix some typos
---
 scripts/test/appveyor-irc-notify.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index b06534c3f..59514bebe 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -55,7 +55,7 @@ export APPVEYOR_URL=https://ci.appveyor.com
 export APPVEYOR_PROJECT_NAME=tor
 export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=gihub
+export APPVEYOR_REPO_PROVIDER=github
 export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
 export APPVEYOR_BUILD_VERSION=1
@@ -88,7 +88,7 @@ import time
 
 def appveyor_vars():
 """
-Return a dict of key value carfted from appveyor environment variables.
+Return a dict of key value crafted from appveyor environment variables.
 """
 
 vars = dict([



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: Changes file for 26979

2018-08-23 Thread nickm 
commit 842509171830406d03f35383c71b57f1264dedb0
Author: teor 
Date:   Tue Jul 31 11:58:04 2018 +1000

Appveyor CI: Changes file for 26979

Closes 26979.
---
 changes/bug26979 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug26979 b/changes/bug26979
new file mode 100644
index 0..e615207b7
--- /dev/null
+++ b/changes/bug26979
@@ -0,0 +1,4 @@
+  o Minor bugfixes (appveyor ci):
+- Improve Appveyor CI IRC logging. Generate correct branches and URLs for
+  pull requests and tags. Use unambiguous short commits.
+  Fixes bug 26979; bugfix on master.



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: sort environmental variables

2018-08-23 Thread nickm 
commit 3ecb7125b4bc0f92d5b7e3be13c787d9ea189639
Author: teor 
Date:   Tue Jul 31 11:54:02 2018 +1000

Appveyor CI: sort environmental variables

To avoid future duplicates.
---
 scripts/test/appveyor-irc-notify.py | 40 ++---
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 59514bebe..639acc6ce 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -51,19 +51,19 @@ delineate multiple messages.
 
 
 Example:
-export APPVEYOR_URL=https://ci.appveyor.com
+export APPVEYOR_ACCOUNT_NAME=isislovecruft
+export APPVEYOR_BUILD_VERSION=1
 export APPVEYOR_PROJECT_NAME=tor
-export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
-export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
-export APPVEYOR_REPO_PROVIDER=github
-export APPVEYOR_REPO_BRANCH=repo_branch
+export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
 export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title
-export APPVEYOR_BUILD_VERSION=1
+export APPVEYOR_REPO_BRANCH=repo_branch
 export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8
+export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft
 export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test"
-export APPVEYOR_ACCOUNT_NAME=isislovecruft
-export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number
+export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23
 export APPVEYOR_REPO_NAME=isislovecruft/tor
+export APPVEYOR_REPO_PROVIDER=github
+export APPVEYOR_URL=https://ci.appveyor.com
 python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} 
{repo_branch} {short_commit} - {repo_commit_author}: 
{repo_commit_message}','Build #{build_version} passed. Details: {build_url} |  
Commit: {commit_url}
 
 See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for 
examples
@@ -96,25 +96,25 @@ def appveyor_vars():
 v.replace('APPVEYOR_', '').lower(),
 os.getenv(v, '').decode('utf-8')
 ) for v in [
-'APPVEYOR_URL',
-'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
-'APPVEYOR_REPO_BRANCH',
-'APPVEYOR_REPO_COMMIT_AUTHOR',
-'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
-'APPVEYOR_REPO_COMMIT_TIMESTAMP',
-'APPVEYOR_REPO_PROVIDER',
+'APPVEYOR_ACCOUNT_NAME',
+'APPVEYOR_BUILD_VERSION',
 'APPVEYOR_PROJECT_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
-'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
+'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
+'APPVEYOR_PULL_REQUEST_NUMBER',
 'APPVEYOR_PULL_REQUEST_TITLE',
-'APPVEYOR_BUILD_VERSION',
+'APPVEYOR_REPO_BRANCH',
 'APPVEYOR_REPO_COMMIT',
+'APPVEYOR_REPO_COMMIT_AUTHOR',
+'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL',
 'APPVEYOR_REPO_COMMIT_MESSAGE',
-'APPVEYOR_ACCOUNT_NAME',
-'APPVEYOR_PULL_REQUEST_NUMBER',
+'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED',
+'APPVEYOR_REPO_COMMIT_TIMESTAMP',
 'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_PROVIDER',
 'APPVEYOR_REPO_TAG_NAME',
+'APPVEYOR_URL',
 ]
 ])
 



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

[tor-commits] [tor/master] Appveyor CI: Make short commits 10 hexdigits long

2018-08-23 Thread nickm 
commit d8ce84aae4b3b070025bddeb5231147c19ace94d
Author: teor 
Date:   Tue Jul 31 11:10:55 2018 +1000

Appveyor CI: Make short commits 10 hexdigits long

That's what git does for tor.

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 297b02b15..fc2ead164 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -25,6 +25,7 @@
 #
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
+#  - make short commits 10 hexdigits long (that's what git does for tor)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -119,7 +120,7 @@ def appveyor_vars():
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:7],
+short_commit=vars["repo_commit"][:10],
 )
 return vars
 



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

[tor-commits] [tor/master] Appveyor CI: Fix GitHub provider detection

2018-08-23 Thread nickm 
commit 73d46b76fd885a108674687cc211efd848641bfe
Author: teor 
Date:   Tue Jul 31 11:09:54 2018 +1000

Appveyor CI: Fix GitHub provider detection

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 4ffea5268..297b02b15 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -22,6 +22,9 @@
 #  - Accept UTF-8
 #  - only guess github URLs
 #  - stop using ANSI colors
+#
+# Modified by teor in 2018:
+#  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -110,7 +113,7 @@ def appveyor_vars():
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
-if vars["repo_provider"] == 'github':
+if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: Generate correct tag names

2018-08-23 Thread nickm 
commit 965a910abf62523e72c50f216fba15b1395fc03d
Author: teor 
Date:   Tue Jul 31 11:47:33 2018 +1000

Appveyor CI: Generate correct tag names

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index eb4d26ba3..b06534c3f 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,7 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
-#  - generate correct branches and URLs for pull requests
+#  - generate correct branches and URLs for pull requests and tags
 #  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
@@ -113,7 +113,8 @@ def appveyor_vars():
 'APPVEYOR_REPO_COMMIT_MESSAGE',
 'APPVEYOR_ACCOUNT_NAME',
 'APPVEYOR_PULL_REQUEST_NUMBER',
-'APPVEYOR_REPO_NAME'
+'APPVEYOR_REPO_NAME',
+'APPVEYOR_REPO_TAG_NAME',
 ]
 ])
 
@@ -122,7 +123,11 @@ def appveyor_vars():
 )
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
-BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
+
+if vars["repo_tag_name"]:
+BRANCH_FMT = u'{repo_name} {repo_tag_name} {short_commit}'
+else:
+BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
 if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: Make short commits 10 hexdigits long

2018-08-23 Thread nickm 
commit d8ce84aae4b3b070025bddeb5231147c19ace94d
Author: teor 
Date:   Tue Jul 31 11:10:55 2018 +1000

Appveyor CI: Make short commits 10 hexdigits long

That's what git does for tor.

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 297b02b15..fc2ead164 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -25,6 +25,7 @@
 #
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
+#  - make short commits 10 hexdigits long (that's what git does for tor)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -119,7 +120,7 @@ def appveyor_vars():
 
 vars.update(
 build_url=BUILD_FMT.format(**vars),
-short_commit=vars["repo_commit"][:7],
+short_commit=vars["repo_commit"][:10],
 )
 return vars
 



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

[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit d0007db1f03fab143e0bb376df187a0560682197
Merge: 90f6c590a 78049afaa
Author: Nick Mathewson 
Date:   Thu Aug 23 20:44:06 2018 -0400

Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

 changes/bug26979|  4 ++
 scripts/test/appveyor-irc-notify.py | 83 -
 2 files changed, 59 insertions(+), 28 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.3.4] Appveyor CI: Fix GitHub provider detection

2018-08-23 Thread nickm 
commit 73d46b76fd885a108674687cc211efd848641bfe
Author: teor 
Date:   Tue Jul 31 11:09:54 2018 +1000

Appveyor CI: Fix GitHub provider detection

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index 4ffea5268..297b02b15 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -22,6 +22,9 @@
 #  - Accept UTF-8
 #  - only guess github URLs
 #  - stop using ANSI colors
+#
+# Modified by teor in 2018:
+#  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -110,7 +113,7 @@ def appveyor_vars():
 
 BUILD_FMT = 
u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
-if vars["repo_provider"] == 'github':
+if vars["repo_provider"].lower().startswith('github'):
 COMMIT_FMT = 
u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}'
 vars.update(commit_url=COMMIT_FMT.format(**vars))
 



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

[tor-commits] [tor/maint-0.3.4] Appveyor CI: Switch to one URL per line

2018-08-23 Thread nickm 
commit 41570157004bd7d546f29e1298ffd5102272929c
Author: teor 
Date:   Tue Jul 31 11:37:11 2018 +1000

Appveyor CI: Switch to one URL per line

Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py 
b/scripts/test/appveyor-irc-notify.py
index f830db4e4..eb4d26ba3 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -27,6 +27,7 @@
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
 #  - generate correct branches and URLs for pull requests
+#  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it 
under the
 # terms of the GNU General Public License as published by the Free Software 
Foundation;
@@ -155,17 +156,16 @@ def notify():
 messages.append(u"{branch_detail} - {repo_commit_author}: 
{repo_commit_message}")
 
 if success:
-m = u"Build #{build_version} passed. Details: {build_url}"
+messages.append(u"Build #{build_version} passed. Details: 
{build_url}")
 if failure:
-m = u"Build #{build_version} failed. Details: {build_url}"
+messages.append(u"Build #{build_version} failed. Details: 
{build_url}")
 
 if "commit_url" in apvy_vars:
-m += " Commit: {commit_url}"
+messages.append(u"Commit: {commit_url}")
 
 if "pull_url" in apvy_vars:
-m += " Pull: {pull_url}"
+messages.append(u"Pull: {pull_url}")
 
-messages.append(m)
 else:
 messages = sys.argv[3:]
 messages = ' '.join(messages)



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

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit 90f6c590afbf90ff8bf2b45921638b23ae32
Merge: 6e0872e86 08ad1f1e4
Author: Nick Mathewson 
Date:   Thu Aug 23 20:07:39 2018 -0400

Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 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/maint-0.3.4] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit 90f6c590afbf90ff8bf2b45921638b23ae32
Merge: 6e0872e86 08ad1f1e4
Author: Nick Mathewson 
Date:   Thu Aug 23 20:07:39 2018 -0400

Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 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.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-08-23 Thread nickm 
commit 1b5c9a580879fe2836e70605f435949cfc6c23ba
Merge: b63d157b4 90f6c590a
Author: Nick Mathewson 
Date:   Thu Aug 23 20:07:47 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 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/maint-0.3.4] CI: Only post Appveyor IRC notifications when the build fails

2018-08-23 Thread nickm 
commit 08ad1f1e463cea014a66670b629c40fa1bbcf669
Author: teor 
Date:   Thu Aug 23 09:39:36 2018 +1000

CI: Only post Appveyor IRC notifications when the build fails

Implements 27275.
---
 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 197097d1f..d1d8d7c45 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -54,9 +54,6 @@ test_script:
 Execute-Bash "VERBOSE=1 make -j2 check"
 }
 
-on_success:
-- cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci success
-
 on_failure:
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure
 
diff --git a/changes/ticket27275 b/changes/ticket27275
new file mode 100644
index 0..d1332e954
--- /dev/null
+++ b/changes/ticket27275
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+- Only post Appveyor IRC notifications when the build fails.
+  Implements ticket 27275.



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

[tor-commits] [tor/release-0.3.4] CI: Only post Appveyor IRC notifications when the build fails

2018-08-23 Thread nickm 
commit 08ad1f1e463cea014a66670b629c40fa1bbcf669
Author: teor 
Date:   Thu Aug 23 09:39:36 2018 +1000

CI: Only post Appveyor IRC notifications when the build fails

Implements 27275.
---
 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 197097d1f..d1d8d7c45 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -54,9 +54,6 @@ test_script:
 Execute-Bash "VERBOSE=1 make -j2 check"
 }
 
-on_success:
-- cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci success
-
 on_failure:
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure
 
diff --git a/changes/ticket27275 b/changes/ticket27275
new file mode 100644
index 0..d1332e954
--- /dev/null
+++ b/changes/ticket27275
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+- Only post Appveyor IRC notifications when the build fails.
+  Implements ticket 27275.



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit 90f6c590afbf90ff8bf2b45921638b23ae32
Merge: 6e0872e86 08ad1f1e4
Author: Nick Mathewson 
Date:   Thu Aug 23 20:07:39 2018 -0400

Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 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] CI: Only post Appveyor IRC notifications when the build fails

2018-08-23 Thread nickm 
commit 08ad1f1e463cea014a66670b629c40fa1bbcf669
Author: teor 
Date:   Thu Aug 23 09:39:36 2018 +1000

CI: Only post Appveyor IRC notifications when the build fails

Implements 27275.
---
 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 197097d1f..d1d8d7c45 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -54,9 +54,6 @@ test_script:
 Execute-Bash "VERBOSE=1 make -j2 check"
 }
 
-on_success:
-- cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci success
-
 on_failure:
 - cmd: C:\Python27\python.exe 
%APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 
tor-ci failure
 
diff --git a/changes/ticket27275 b/changes/ticket27275
new file mode 100644
index 0..d1332e954
--- /dev/null
+++ b/changes/ticket27275
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+- Only post Appveyor IRC notifications when the build fails.
+  Implements ticket 27275.



___
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.3.4'

2018-08-23 Thread nickm 
commit 9323f5d1d45f46e55f565fff59a4595954328219
Merge: d50f90bfc 90f6c590a
Author: Nick Mathewson 
Date:   Thu Aug 23 20:07:47 2018 -0400

Merge branch 'maint-0.3.4'

 .appveyor.yml   | 3 ---
 changes/ticket27275 | 3 +++
 2 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.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-08-23 Thread nickm 
commit b63d157b498669b3935b072f88f0fad64bcb8b1e
Merge: d1a9f6de9 6e0872e86
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-23 Thread nickm 
commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



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

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

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



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

[tor-commits] [tor/release-0.3.3] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

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

2018-08-23 Thread nickm 
commit d0dadf4d17540edd33da9617366cd6f3c7568c69
Merge: cbd71f5c9 e01ea64f0
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-23 Thread nickm 
commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076
Merge: ced350882 e01ea64f0
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index f0e8b9b72,2e7d39932..aea3ad659
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -23,8 -22,11 +23,10 @@@
  #include 
  #endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
 -#define GEOIP_PRIVATE
  #define ROUTER_PRIVATE
  #define CIRCUITSTATS_PRIVATE
  #define CIRCUITLIST_PRIVATE

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

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

2018-08-23 Thread nickm 
commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

[tor-commits] [tor/release-0.3.2] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



___
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.9] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

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

2018-08-23 Thread nickm 
commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076
Merge: ced350882 e01ea64f0
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index f0e8b9b72,2e7d39932..aea3ad659
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -23,8 -22,11 +23,10 @@@
  #include 
  #endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
 -#define GEOIP_PRIVATE
  #define ROUTER_PRIVATE
  #define CIRCUITSTATS_PRIVATE
  #define CIRCUITLIST_PRIVATE



___
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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-08-23 Thread nickm 
commit 060f6f60792ca5c8062da3583cd281d827b7c5f7
Merge: 76be75b36 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



___
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.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



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

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

2018-08-23 Thread nickm 
commit f68d4318e74e1ed3807e91b5b512668c932cab43
Merge: 3f55d2efe 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.3' into maint-0.3.4

2018-08-23 Thread nickm 
commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076
Merge: ced350882 e01ea64f0
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index f0e8b9b72,2e7d39932..aea3ad659
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -23,8 -22,11 +23,10 @@@
  #include 
  #endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
 -#define GEOIP_PRIVATE
  #define ROUTER_PRIVATE
  #define CIRCUITSTATS_PRIVATE
  #define CIRCUITLIST_PRIVATE



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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



___
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.9] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"

___
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.3.4'

2018-08-23 Thread nickm 
commit d50f90bfc4457b499d5bf56b674289f70f1004bd
Merge: 2ae92ab97 6e0872e86
Author: Nick Mathewson 
Date:   Thu Aug 23 19:37:32 2018 -0400

Merge branch 'maint-0.3.4'

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 745aa987a,aea3ad659..f96a0b33e
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -34,42 -33,28 +36,34 @@@
  #define MAIN_PRIVATE
  #define STATEFILE_PRIVATE
  
- /*
-  * Linux doesn't provide lround in math.h by default, but mac os does...
-  * It's best just to leave math.h out of the picture entirely.
-  */
- //#include 
- long int lround(double x);
- double fabs(double x);
- 
 -#include "or.h"
 -#include "backtrace.h"
 -#include "buffers.h"
 -#include "circuitlist.h"
 -#include "circuitstats.h"
 -#include "compress.h"
 -#include "config.h"
 -#include "connection_edge.h"
 -#include "rendcommon.h"
 -#include "rendcache.h"
 -#include "test.h"
 -#include "main.h"
 -#include "memarea.h"
 -#include "onion.h"
 -#include "onion_ntor.h"
 -#include "onion_fast.h"
 -#include "onion_tap.h"
 -#include "policies.h"
 -#include "rephist.h"
 -#include "routerparse.h"
 -#include "statefile.h"
 -#include "crypto_curve25519.h"
 +#include "core/or/or.h"
 +#include "lib/err/backtrace.h"
 +#include "lib/container/buffers.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuitstats.h"
 +#include "lib/compress/compress.h"
 +#include "app/config/config.h"
 +#include "core/or/connection_edge.h"
 +#include "feature/rend/rendcommon.h"
 +#include "feature/rend/rendcache.h"
 +#include "test/test.h"
 +#include "core/mainloop/main.h"
 +#include "lib/memarea/memarea.h"
 +#include "core/crypto/onion.h"
 +#include "core/crypto/onion_ntor.h"
 +#include "core/crypto/onion_fast.h"
 +#include "core/crypto/onion_tap.h"
 +#include "core/or/policies.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/nodelist/routerparse.h"
 +#include "app/config/statefile.h"
 +#include "lib/crypt_ops/crypto_curve25519.h"
 +
 +#include "core/or/extend_info_st.h"
 +#include "core/or/or_circuit_st.h"
 +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
 +#include "feature/rend/rend_intro_point_st.h"
 +#include "feature/rend/rend_service_descriptor_st.h"
  
  /** Run unit tests for the onion handshake code. */
  static void

___
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.3.2' into maint-0.3.3

2018-08-23 Thread nickm 
commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)




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

[tor-commits] [tor/master] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-23 Thread nickm 
commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-23 Thread nickm 
commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 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.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-23 Thread nickm 
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE

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

[tor-commits] [tor/maint-0.3.3] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

[tor-commits] [tor/maint-0.3.2] Silence a compilation warning on MSVC 2017 and clang-cl

2018-08-23 Thread nickm 
commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor 
Date:   Thu Aug 23 18:55:39 2018 +1000

Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.
---
 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0..79221b3df
--- /dev/null
+++ b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+- Silence a compilation warning on MSVC 2017 and clang-cl.
+  Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
index 0fef69790..6330eb9b9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
 #include 
 #endif
 
+#include 
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define GEOIP_PRIVATE
@@ -31,14 +33,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include 
-long int lround(double x);
-double fabs(double x);
-
 #include "or.h"
 #include "backtrace.h"
 #include "buffers.h"



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

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

2018-08-23 Thread translation 
commit 031a0508165594928d10a634923ac152b6a5b0ec
Author: Translation commit bot 
Date:   Thu Aug 23 22:15:03 2018 +

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

diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 9bd057c86..9ad130eb3 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -20,6 +20,6 @@
 
 
 
-
+
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

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

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

2018-08-23 Thread translation 
commit 05ab2b4b9bf62e3f47dbad1983ad72f18ca02f5c
Author: Translation commit bot 
Date:   Thu Aug 23 22:15:08 2018 +

Update translations for abouttor-homepage_completed
---
 da/aboutTor.dtd | 42 +++---
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 6a051316f..9ad130eb3 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -1,45 +1,25 @@
 
 
 
 
-
-
-
-
-
-
-
-
-
+
+
 
 
 
-
+
 https://duckduckgo.com;>
 
-
-
-
-
-
-
-
-https://www.torproject.org/download/download.html.en#warning;>
+
+
+
 
-
-
-
-
-https://www.torproject.org/docs/tor-doc-relay.html.en;>
-
-https://www.torproject.org/getinvolved/volunteer.html.en;>
-
-https://www.torproject.org/donate/donate.html.en;>
+
 
-
-
-https://www.torproject.org/about/overview.html.en;>
+
+
+https://www.torproject.org/getinvolved/volunteer.html.en;>

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

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

2018-08-23 Thread translation 
commit a188142810ffd26af45bcda61f8300a2b9a97aa0
Author: Translation commit bot 
Date:   Thu Aug 23 21:48:06 2018 +

Update translations for torbutton-abouttorproperties_completed
---
 nb/abouttor.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nb/abouttor.properties b/nb/abouttor.properties
index 7528cecc5..dbf58d1e8 100644
--- a/nb/abouttor.properties
+++ b/nb/abouttor.properties
@@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Verdensomspennende 
nettverksfrihet
 aboutTor.donationBanner.tagline3=Frihet på nett
 aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
 aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
+
+aboutTor.newsletter.tagline=FÃ¥ de siste nyhetene fra Tor rett til innboksen 
din.
+aboutTor.newsletter.link_text=Registrer deg for Tor Nyheter.

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

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

2018-08-23 Thread translation 
commit 6ebc7c550f3298aa214398b99697e3806643a036
Author: Translation commit bot 
Date:   Thu Aug 23 21:48:02 2018 +

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

diff --git a/nb/abouttor.properties b/nb/abouttor.properties
index d53095af6..dbf58d1e8 100644
--- a/nb/abouttor.properties
+++ b/nb/abouttor.properties
@@ -13,5 +13,5 @@ aboutTor.donationBanner.tagline3=Frihet på nett
 aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
 aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
 
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your 
inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
+aboutTor.newsletter.tagline=FÃ¥ de siste nyhetene fra Tor rett til innboksen 
din.
+aboutTor.newsletter.link_text=Registrer deg for Tor Nyheter.

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

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

2018-08-23 Thread translation 
commit 184cf8b1503294e161b5f88b880507ac20022a19
Author: Translation commit bot 
Date:   Thu Aug 23 21:46:38 2018 +

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

diff --git a/nb/nb.po b/nb/nb.po
index e65364bf1..3a83ff8fe 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -8,13 +8,14 @@
 # lateralus, 2013-2014
 # Per Thorsheim , 2015
 # pr0xity, 2014
+# ty moss , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-16 14:16+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2018-08-23 21:25+\n"
+"Last-Translator: ty moss \n"
 "Language-Team: Norwegian Bokmål 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -129,7 +130,7 @@ msgstr "Oppsett av nettverksenheter og tilkoblinger"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:101
 msgid "Additional Software"
-msgstr ""
+msgstr "Tilleggsprogramvare"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"
@@ -161,7 +162,7 @@ msgstr "GnuPG-nøkkelringer, og oppsett"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:166
 msgid "Bitcoin Client"
-msgstr ""
+msgstr "Bitcoin Klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Electrum's bitcoin wallet and configuration"

___
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

2018-08-23 Thread translation 
commit 7d9b1bf46ce4aacd9e9c3c6a028d2a2352cc37e5
Author: Translation commit bot 
Date:   Thu Aug 23 21:45:52 2018 +

Update translations for tails-misc
---
 nb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nb.po b/nb.po
index d3f3f7bf7..54fa277ad 100644
--- a/nb.po
+++ b/nb.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-16 14:42+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-23 21:25+\n"
+"Last-Translator: ty moss \n"
 "Language-Team: Norwegian Bokmål 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -665,7 +665,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
-msgstr ""
+msgstr "Tilleggsprogramvare"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
 msgid ""

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

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

2018-08-23 Thread translation 
commit a97165f8df72581948c4323bbc972e959e078112
Author: Translation commit bot 
Date:   Thu Aug 23 21:15:08 2018 +

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

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index b5552c2c2..dbfac3646 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -20,6 +20,6 @@
 
 
 
-
+
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

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

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

2018-08-23 Thread translation 
commit 797861a9585d32b726e96af3dce9c0bca0411b3a
Author: Translation commit bot 
Date:   Thu Aug 23 21:15:03 2018 +

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

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index b5552c2c2..dbfac3646 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -20,6 +20,6 @@
 
 
 
-
+
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

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

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

2018-08-23 Thread translation 
commit 1eb62f9878cf0c260b58cd8485011aa398f65400
Author: Translation commit bot 
Date:   Thu Aug 23 19:48:21 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 ka/abouttbupdate.dtd | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/ka/abouttbupdate.dtd b/ka/abouttbupdate.dtd
new file mode 100644
index 0..0a080f392
--- /dev/null
+++ b/ka/abouttbupdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+

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

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

2018-08-23 Thread translation 
commit b7cbc88dd222c7f8ca291b78aab6a3555863893c
Author: Translation commit bot 
Date:   Thu Aug 23 19:48:07 2018 +

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

diff --git a/es_AR/abouttor.properties b/es_AR/abouttor.properties
index 26ad7704d..46710bead 100644
--- a/es_AR/abouttor.properties
+++ b/es_AR/abouttor.properties
@@ -13,5 +13,5 @@ aboutTor.donationBanner.tagline3=Libertad en línea
 aboutTor.donationBanner.tagline4=Fomentando la libre expresión alrededor del 
mundo
 aboutTor.donationBanner.tagline5=Protegiendo la privacidad de millones todos 
los días
 
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your 
inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
+aboutTor.newsletter.tagline=Recibí las últimas noticias de Tor derecho en tu 
bandeja de entrada.
+aboutTor.newsletter.link_text=Registrate en Tor News.

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

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

2018-08-23 Thread translation 
commit 7084a593d8378937ef0a58af4562322775088d0f
Author: Translation commit bot 
Date:   Thu Aug 23 19:48:16 2018 +

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

diff --git a/ka/abouttbupdate.dtd b/ka/abouttbupdate.dtd
index 37567bd7e..0a080f392 100644
--- a/ka/abouttbupdate.dtd
+++ b/ka/abouttbupdate.dtd
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
+
 
-
+

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

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

2018-08-23 Thread translation 
commit b06cb4d3757af39c6a59121db0a5a29b7caef0cb
Author: Translation commit bot 
Date:   Thu Aug 23 19:48:11 2018 +

Update translations for torbutton-abouttorproperties_completed
---
 es_AR/abouttor.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/es_AR/abouttor.properties b/es_AR/abouttor.properties
index 019f2..46710bead 100644
--- a/es_AR/abouttor.properties
+++ b/es_AR/abouttor.properties
@@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Libertad en la Red alrededor 
del mundo
 aboutTor.donationBanner.tagline3=Libertad en línea
 aboutTor.donationBanner.tagline4=Fomentando la libre expresión alrededor del 
mundo
 aboutTor.donationBanner.tagline5=Protegiendo la privacidad de millones todos 
los días
+
+aboutTor.newsletter.tagline=Recibí las últimas noticias de Tor derecho en tu 
bandeja de entrada.
+aboutTor.newsletter.link_text=Registrate en Tor News.

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

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

2018-08-23 Thread translation 
commit 2aa8f1c4cd6700885ece6fac0f7560b45059b679
Author: Translation commit bot 
Date:   Thu Aug 23 19:47:52 2018 +

Update translations for torbutton-torbuttondtd
---
 ka/torbutton.dtd | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index eed543af7..2dcd331b7 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -2,28 +2,28 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
+
 
 
 
@@ -31,14 +31,14 @@
 
 
 
-
+
 
-
+
 
-
+
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-08-23 Thread translation 
commit 105cd38a162a0b8bf30062b64b92243a40e59da2
Author: Translation commit bot 
Date:   Thu Aug 23 19:47:19 2018 +

Update translations for tor-browser-manual
---
 ka/ka.po | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ka/ka.po b/ka/ka.po
index ae4ec3a0e..128400670 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -276,11 +276,11 @@ msgstr ""
 
 #: downloading.page:7
 msgid "How to download Tor Browser"
-msgstr ""
+msgstr "როგორ ჩამოვტვირთო Tor Browser"
 
 #: downloading.page:10
 msgid "Downloading"
-msgstr ""
+msgstr "ჩამოტვირთვა"
 
 #: downloading.page:12
 msgid ""
@@ -310,7 +310,7 @@ msgstr ""
 
 #: downloading.page:34
 msgid "To use GetTor via email:"
-msgstr ""
+msgstr "GetTor-ის ელფოსტით 
გამოსაყენებლად:"
 
 #: downloading.page:39
 msgid ""
@@ -331,7 +331,7 @@ msgstr ""
 
 #: downloading.page:57
 msgid "To use GetTor via Twitter:"
-msgstr ""
+msgstr "GetTor-ის Twitter-ით 
გამოსაყენებლად:"
 
 #: downloading.page:62
 msgid ""
@@ -404,7 +404,7 @@ msgstr ""
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
-msgstr ""
+msgstr "Tor Browser-ის პირველად გაშვება"
 
 #: first-time.page:12
 msgid ""
@@ -497,11 +497,11 @@ msgstr "Tor Browser-ის 
სახელმძღვანელო"
 
 #: known-issues.page:6
 msgid "A list of known issues."
-msgstr ""
+msgstr "ცნობილი ხარვეზების 
ჩამონათვალი"
 
 #: known-issues.page:10
 msgid "Known Issues"
-msgstr ""
+msgstr "ცნობილი ხარვეზები"
 
 #: known-issues.page:14
 msgid ""
@@ -528,7 +528,7 @@ msgstr ""
 
 #: known-issues.page:32
 msgid "Microsoft Security Essentials"
-msgstr ""
+msgstr "Microsoft Security Essentials"
 
 #: known-issues.page:37
 msgid ""
@@ -596,7 +596,7 @@ msgstr ""
 
 #: managing-identities.page:29
 msgid "The URL bar"
-msgstr ""
+msgstr "მისამართების ველი"
 
 #: managing-identities.page:30
 msgid ""
@@ -1362,7 +1362,7 @@ msgstr ""
 
 #: updating.page:58
 msgid "Updating Tor Browser manually"
-msgstr ""
+msgstr "Tor Browser-ის ხელით განახლება"
 
 #: updating.page:61
 msgid ""

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

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

2018-08-23 Thread translation 
commit fe6eecdd851cd666b3fb357a1518342bfe0f7c25
Author: Translation commit bot 
Date:   Thu Aug 23 19:46:38 2018 +

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

diff --git a/ka/ka.po b/ka/ka.po
index 3998947bd..cead6b614 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-16 14:16+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-23 19:18+\n"
+"Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:101
 msgid "Additional Software"
-msgstr ""
+msgstr "დამატებითი პროგრამა"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"

___
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

2018-08-23 Thread translation 
commit 906e9f85752d5a2244212854e1f2fd5c987ae432
Author: Translation commit bot 
Date:   Thu Aug 23 19:45:52 2018 +

Update translations for tails-misc
---
 ka.po | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ka.po b/ka.po
index 3643e9ccd..04a0cb7c0 100644
--- a/ka.po
+++ b/ka.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-23 19:15+\n"
+"PO-Revision-Date: 2018-08-23 19:18+\n"
 "Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -530,7 +530,7 @@ msgstr ""
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:109
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
-msgstr ""
+msgstr "{partition_name} – {container_path}"
 
 #. Translators: Don't translate {volume_name} and {path_to_file_container},
 #. they are placeholders and will be replaced. You should only have to
@@ -546,7 +546,7 @@ msgstr "{volume_name} – {path_to_file_container}"
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
-msgstr ""
+msgstr "{partition_name} – {drive_name}"
 
 #. Translators: Don't translate {volume_name} and {drive_name},
 #. they are placeholders and will be replaced. You should only have to
@@ -555,11 +555,11 @@ msgstr ""
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:129
 #, python-brace-format
 msgid "{volume_name} – {drive_name}"
-msgstr ""
+msgstr "{volume_name} – {drive_name}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
-msgstr ""
+msgstr "ფაილის სათავსები არ 
დამატებულა"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
 msgid "No VeraCrypt devices detected"
@@ -567,7 +567,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
 msgid "Container already added"
-msgstr ""
+msgstr "სათავსი უკვე დამატებულია"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
 #, python-format
@@ -587,7 +587,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137
 msgid "Error opening file"
-msgstr ""
+msgstr "შეცდომა ფაილის გახსნისას"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159
 msgid "Not a VeraCrypt container"
@@ -615,7 +615,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid "Report an error"
-msgstr ""
+msgstr "შეცდომის მოხსენება"
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1
 #: 
../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1
@@ -632,7 +632,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
 msgid "Tor Browser"
-msgstr "Tor-ბრაუზერი"
+msgstr "Tor Browser"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid "Anonymous Web Browser"
@@ -656,7 +656,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
-msgstr ""
+msgstr "დამატებითი პროგრამა"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
 msgid ""
@@ -674,7 +674,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
 msgid "File Containers"
-msgstr ""
+msgstr "ფაილის სათავსები"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80
 msgid "_Add"
@@ -682,7 +682,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86
 msgid "Add a file container"
-msgstr ""
+msgstr "ფაილის სათავსის დამატება"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103
 msgid "Partitions and Drives"

___
tor-commits mailing list
tor-commits@lists.torproject.org

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

2018-08-23 Thread translation 
commit cc48e57fc97bdb644207b48775fc4b0b9aecace7
Author: Translation commit bot 
Date:   Thu Aug 23 19:15:58 2018 +

Update translations for tails-misc
---
 ka.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ka.po b/ka.po
index 7d9d90ea4..3643e9ccd 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-16 14:42+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-23 19:15+\n"
+"Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -423,15 +423,15 @@ msgstr "გაიგე მეტი"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Tor is not ready"
-msgstr ""
+msgstr "Tor არაა მზად"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr ""
+msgstr "Tor არაა მზად. მაინც გაეშვას 
Tor Browser?"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:45
 msgid "Start Tor Browser"
-msgstr ""
+msgstr "Tor Browser-ის გაშვება"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/torsta...@tails.boum.org/extension.js:40
 msgid "Tor"
@@ -443,7 +443,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
-msgstr ""
+msgstr "ნამდვილად გსურთ დაუცველი 
ბრაუზერის გაშვება?"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
@@ -454,30 +454,30 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
-msgstr ""
+msgstr "ეშვება დაუცველი ბრაუზერ
ი..."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
-msgstr ""
+msgstr "შესაძლოა გარკვეულ ხანს 
გასტანოს, გთხოვთ მოითმინოთ."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
-msgstr ""
+msgstr "დაუცველი ბრაუზერის დახურ
ვა..."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
-msgstr ""
+msgstr "შესაძლოა გარკვეულ ხანს 
გასტანოს, არ გამორთოთ 
დაუცველი ბრაუზერი, სანამ 
სათანადოდ არ დაიხურება."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
-msgstr ""
+msgstr "Tor-ის ხელახლა გაშვება ვერ 
მოხერხდა."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
 msgid "Unsafe Browser"
-msgstr ""
+msgstr "დაუცველი ბრაუზერი"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91
 msgid ""
@@ -491,7 +491,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104
 msgid "Failed to configure browser."
-msgstr ""
+msgstr "ბრაუზერის გამართვა ვერ 
მოხერხდა."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110
 msgid ""
@@ -501,17 +501,17 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121
 msgid "Failed to run browser."
-msgstr ""
+msgstr "ბრაუზერის გაშვება ვერ 
მოხერხდა."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:56
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
-msgstr ""
+msgstr "{volume_label} ({volume_size})"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:59
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
-msgstr ""
+msgstr "{partition_name} ({partition_size})"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:62
 #, python-brace-format
@@ -539,7 +539,7 @@ msgstr ""
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:116
 #, python-brace-format
 msgid "{volume_name} – {path_to_file_container}"
-msgstr ""
+msgstr

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

2018-08-23 Thread translation 
commit 8b36f6e27ad842e533c35853bb2fe0771e79009e
Author: Translation commit bot 
Date:   Thu Aug 23 19:15:41 2018 +

Update translations for liveusb-creator
---
 ka/ka.po | 64 
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/ka/ka.po b/ka/ka.po
index 66da63819..84bf9bc87 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 11:40+0200\n"
-"PO-Revision-Date: 2018-08-16 14:46+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-23 19:08+\n"
+"Last-Translator: A. C. \n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,14 +29,14 @@ msgstr ""
 #: ../tails_installer/creator.py:153
 #, python-format
 msgid "Wrote to device at %(speed)d MB/sec"
-msgstr ""
+msgstr "მოწყობილობაზე ჩაწერა %(speed)d 
მბაიტ/წმ სიჩქარით"
 
 #: ../tails_installer/creator.py:296
 #, python-format
 msgid ""
 "There was a problem executing the following command: `%(command)s`.\n"
 "A more detailed error log has been written to '%(filename)s'."
-msgstr ""
+msgstr "ხარვეზი წარმოიქმნა 
შემდეგი ბრძანების 
გაშვებისას `%(command)s`.\nაღრიცხვის 
ვრცელი ჩანაწერი შეცდომის 
შესახებ განთავსებულია 
ფაილში '%(filename)s'."
 
 #: ../tails_installer/creator.py:315
 msgid "Verifying SHA1 checksum of LiveCD image..."
@@ -111,7 +111,7 @@ msgstr ""
 
 #: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
 msgid "Unknown filesystem.  Your device may need to be reformatted."
-msgstr ""
+msgstr "უცნობი საფაილო სისტემა. 
თქვენი მოწყობილობა, შესაძლოა 
ხელახლა დაფორმატებას საჭირ
ოებდეს."
 
 #: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
 #, python-format
@@ -160,15 +160,15 @@ msgstr ""
 #: ../tails_installer/creator.py:993
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
-msgstr ""
+msgstr "მხარდაუჭერელი 
მოწყობილობა „%(device)s“, გთხოვთ 
მოგვახსენოთ ხარვეზის სახით."
 
 #: ../tails_installer/creator.py:996
 msgid "Trying to continue anyway."
-msgstr ""
+msgstr "მაინც გაგრძელების 
მცდელობა."
 
 #: ../tails_installer/creator.py:1005 ../tails_installer/creator.py:1401
 msgid "Verifying filesystem..."
-msgstr ""
+msgstr "ფაილური სისტემის 
გადამოწმება..."
 
 #: ../tails_installer/creator.py:1029
 #, python-format
@@ -177,7 +177,7 @@ msgstr ""
 
 #: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1434
 msgid "Installing bootloader..."
-msgstr ""
+msgstr "ჩამტვირთავი ყენდება..."
 
 #: ../tails_installer/creator.py:1061
 #, python-format
@@ -187,7 +187,7 @@ msgstr ""
 #: ../tails_installer/creator.py:1069 ../tails_installer/creator.py:1452
 #, python-format
 msgid "Removing %(file)s"
-msgstr ""
+msgstr "%(file)s იშლება"
 
 #: ../tails_installer/creator.py:1183
 #, python-format
@@ -196,7 +196,7 @@ msgstr ""
 
 #: ../tails_installer/creator.py:1203
 msgid "Unable to find partition"
-msgstr ""
+msgstr "დანაყოფი ვერ მოიძებნა"
 
 #: ../tails_installer/creator.py:1226
 #, python-format
@@ -233,7 +233,7 @@ msgstr ""
 
 #: ../tails_installer/creator.py:1351
 msgid "Synchronizing data on disk..."
-msgstr ""
+msgstr "მონაცემების დისკზე სინქრ
ონიზაცია..."
 
 #: ../tails_installer/creator.py:1393
 msgid "Error probing device"
@@ -241,12 +241,12 @@ msgstr ""
 
 #: ../tails_installer/creator.py:1395
 msgid "Unable to find any supported device"
-msgstr ""
+msgstr "მხარდაჭერილი 
მოწყობილობის მოძიება ვერ ხერ
ხდება"
 
 #: ../tails_installer/creator.py:1405
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-msgstr ""
+msgstr "დარწმუნდით, რომ თქვენი 
USB-გასაღები შეერთებულია და 
დაფორმატებულია FAT-სისტემით"
 
 #: ../tails_installer/creator.py:1408
 #, python-format
@@ -273,12 +273,12 @@ msgstr ""
 #: ../tails_installer/gui.py:69
 #, python-format
 msgid "Unknown release: %s"

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit ced350882dc7fc7e66adce91f9514a7244f26c76
Merge: 573b6e4f2 fadcab920
Author: Nick Mathewson 
Date:   Thu Aug 23 14:22:30 2018 -0400

Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 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.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-08-23 Thread nickm 
commit d1a9f6de9d224249e34b1d18c5e8ec0fcec81ec0
Merge: 1962a4ea9 ced350882
Author: Nick Mathewson 
Date:   Thu Aug 23 14:24:41 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 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.3.4] Bootstrap: check the exit policy and flag on descriptors

2018-08-23 Thread nickm 
commit fadcab920bb0668a4ac0809467495f28ff112e76
Author: teor 
Date:   Fri Aug 24 00:10:52 2018 +1000

Bootstrap: check the exit policy and flag on descriptors

Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.

After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.

Fixes 27236; bugfix on 0.2.6.3-alpha.
---
 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/changes/bug27236 b/changes/bug27236
new file mode 100644
index 0..76d792f4c
--- /dev/null
+++ b/changes/bug27236
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing, bootstrap):
+- When calculating bootstrap progress, check exit policies and the exit
+  flag. Previously, Tor would only check the exit flag, which caused
+  race conditions in small and fast networks like chutney.
+  Fixes bug 27236; bugfix on 0.2.6.3-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index ce1830083..85e4ae38d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -76,10 +76,17 @@ static void node_free_(node_t *node);
 /** count_usable_descriptors counts descriptors with these flag(s)
  */
 typedef enum {
-  /* All descriptors regardless of flags */
-  USABLE_DESCRIPTOR_ALL = 0,
-  /* Only descriptors with the Exit flag */
-  USABLE_DESCRIPTOR_EXIT_ONLY = 1
+  /* All descriptors regardless of flags or exit policies */
+  USABLE_DESCRIPTOR_ALL = 0U,
+  /* Only count descriptors with an exit policy that allows at least one port
+   */
+  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
+  /* Only count descriptors for relays that have the exit flag in the
+   * consensus */
+  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
+  /* Only count descriptors for relays that have the policy and the flag */
+  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
+USABLE_DESCRIPTOR_EXIT_FLAG)
 } usable_descriptor_t;
 static void count_usable_descriptors(int *num_present,
  int *num_usable,
@@ -2110,8 +2117,11 @@ get_dir_info_status_string(void)
  * *num_present).
  *
  * If in_set is non-NULL, only consider those routers in in_set.
- * If exit_only is USABLE_DESCRIPTOR_EXIT_ONLY, only consider nodes
- * with the Exit flag.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
+ * with an exit policy that accepts at least one port.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
+ * with the exit flag in the consensus.
+ *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
  */
@@ -2132,11 +2142,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (!node)
  continue; /* This would be a bug: every entry in the consensus is
 * supposed to have a node. */
-   if (exit_only == USABLE_DESCRIPTOR_EXIT_ONLY && ! rs->is_exit)
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) && ! rs->is_exit)
  continue;
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
+ /* Do the policy check last, because it's potentially expensive */
+ if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+ node_has_preferred_descriptor(node, 0) &&
+ node_exit_policy_rejects_all(node)) {
+   continue;
+ }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2154,10 +2170,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  }
   SMARTLIST_FOREACH_END(rs);
 
-  log_debug(LD_DIR, "%d usable, %d present (%s%s).",
+  log_debug(LD_DIR, "%d usable, %d present (%s%s%s%s%s).",
 *num_usable, *num_present,
 md ? "microdesc" : "desc",
-exit_only == USABLE_DESCRIPTOR_EXIT_ONLY ? " exits" : "s");
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " exit" : "s",
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) ?
+  " policies" : "" ,
+(exit_only == USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " and" : "" ,
+(exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) ?
+  " flags": "" );
 }
 
 /** Return an estimate of which fraction of usable paths through the Tor
@@ -2207,15 +2230,9 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 });
   }
 
-  /* All nodes with exit flag
-   * If we're in a network with TestingDirAuthVoteExit set,
-   * this can cause false positives on have_consensus_path,
-   * incorrectly setting it to CONSENSUS_PATH_EXIT.

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

2018-08-23 Thread nickm 
commit 2ae92ab973019cd88c5b610462a6be99a2ac4c6f
Merge: 692efdad0 ced350882
Author: Nick Mathewson 
Date:   Thu Aug 23 14:26:04 2018 -0400

Merge branch 'maint-0.3.4'

 changes/bug27236|  5 +++
 src/feature/nodelist/nodelist.c | 83 +
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --cc src/feature/nodelist/nodelist.c
index 75a08fe75,0..bf298337a
mode 100644,00..100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -1,2521 -1,0 +1,2522 @@@
 +/* Copyright (c) 2001 Matej Pfajfar.
 + * Copyright (c) 2001-2004, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file nodelist.c
 + *
 + * \brief Structures and functions for tracking what we know about the routers
 + *   on the Tor network, and correlating information from networkstatus,
 + *   routerinfo, and microdescs.
 + *
 + * The key structure here is node_t: that's the canonical way to refer
 + * to a Tor relay that we might want to build a circuit through.  Every
 + * node_t has either a routerinfo_t, or a routerstatus_t from the current
 + * networkstatus consensus.  If it has a routerstatus_t, it will also
 + * need to have a microdesc_t before you can use it for circuits.
 + *
 + * The nodelist_t is a global singleton that maps identities to node_t
 + * objects.  Access them with the node_get_*() functions.  The nodelist_t
 + * is maintained by calls throughout the codebase
 + *
 + * Generally, other code should not have to reach inside a node_t to
 + * see what information it has.  Instead, you should call one of the
 + * many accessor functions that works on a generic node_t.  If there
 + * isn't one that does what you need, it's better to make such a function,
 + * and then use it.
 + *
 + * For historical reasons, some of the functions that select a node_t
 + * from the list of all usable node_t objects are in the routerlist.c
 + * module, since they originally selected a routerinfo_t. (TODO: They
 + * should move!)
 + *
 + * (TODO: Perhaps someday we should abstract the remaining ways of
 + * talking about a relay to also be node_t instances. Those would be
 + * routerstatus_t as used for directory requests, and dir_server_t as
 + * used for authorities and fallback directories.)
 + */
 +
 +#define NODELIST_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "lib/net/address.h"
 +#include "core/or/address_set.h"
 +#include "feature/client/bridges.h"
 +#include "app/config/config.h"
 +#include "feature/control/control.h"
 +#include "feature/dircache/dirserv.h"
 +#include "feature/client/entrynodes.h"
 +#include "feature/stats/geoip.h"
 +#include "feature/hs/hs_common.h"
 +#include "feature/hs/hs_client.h"
 +#include "core/mainloop/main.h"
 +#include "feature/nodelist/microdesc.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "core/or/policies.h"
 +#include "core/or/protover.h"
 +#include "feature/rend/rendservice.h"
 +#include "feature/relay/router.h"
 +#include "feature/nodelist/routerlist.h"
 +#include "feature/nodelist/routerparse.h"
 +#include "feature/nodelist/routerset.h"
 +#include "feature/nodelist/torcert.h"
 +
 +#include 
 +
 +#include "feature/dirauth/mode.h"
 +
 +#include "feature/dirclient/dir_server_st.h"
 +#include "feature/nodelist/microdesc_st.h"
 +#include "feature/nodelist/networkstatus_st.h"
 +#include "feature/nodelist/node_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "feature/nodelist/routerlist_st.h"
 +#include "feature/nodelist/routerstatus_st.h"
 +
 +static void nodelist_drop_node(node_t *node, int remove_from_ht);
 +#define node_free(val) \
 +  FREE_AND_NULL(node_t, node_free_, (val))
 +static void node_free_(node_t *node);
 +
 +/** count_usable_descriptors counts descriptors with these flag(s)
 + */
 +typedef enum {
-   /* All descriptors regardless of flags */
-   USABLE_DESCRIPTOR_ALL = 0,
-   /* Only descriptors with the Exit flag */
-   USABLE_DESCRIPTOR_EXIT_ONLY = 1
++  /* All descriptors regardless of flags or exit policies */
++  USABLE_DESCRIPTOR_ALL = 0U,
++  /* Only count descriptors with an exit policy that allows at least one port
++   */
++  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
++  /* Only count descriptors for relays that have the exit flag in the
++   * consensus */
++  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
++  /* Only count descriptors for relays that have the policy and the flag */
++  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
++USABLE_DESCRIPTOR_EXIT_FLAG)
 +} usable_descriptor_t;
 +static void count_usable_descriptors(int *num_present,
 + int *num_usable,
 + smartlist_t *descs_out,
 +

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit ced350882dc7fc7e66adce91f9514a7244f26c76
Merge: 573b6e4f2 fadcab920
Author: Nick Mathewson 
Date:   Thu Aug 23 14:22:30 2018 -0400

Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 deletions(-)



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

[tor-commits] [tor/master] Bootstrap: check the exit policy and flag on descriptors

2018-08-23 Thread nickm 
commit fadcab920bb0668a4ac0809467495f28ff112e76
Author: teor 
Date:   Fri Aug 24 00:10:52 2018 +1000

Bootstrap: check the exit policy and flag on descriptors

Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.

After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.

Fixes 27236; bugfix on 0.2.6.3-alpha.
---
 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/changes/bug27236 b/changes/bug27236
new file mode 100644
index 0..76d792f4c
--- /dev/null
+++ b/changes/bug27236
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing, bootstrap):
+- When calculating bootstrap progress, check exit policies and the exit
+  flag. Previously, Tor would only check the exit flag, which caused
+  race conditions in small and fast networks like chutney.
+  Fixes bug 27236; bugfix on 0.2.6.3-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index ce1830083..85e4ae38d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -76,10 +76,17 @@ static void node_free_(node_t *node);
 /** count_usable_descriptors counts descriptors with these flag(s)
  */
 typedef enum {
-  /* All descriptors regardless of flags */
-  USABLE_DESCRIPTOR_ALL = 0,
-  /* Only descriptors with the Exit flag */
-  USABLE_DESCRIPTOR_EXIT_ONLY = 1
+  /* All descriptors regardless of flags or exit policies */
+  USABLE_DESCRIPTOR_ALL = 0U,
+  /* Only count descriptors with an exit policy that allows at least one port
+   */
+  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
+  /* Only count descriptors for relays that have the exit flag in the
+   * consensus */
+  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
+  /* Only count descriptors for relays that have the policy and the flag */
+  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
+USABLE_DESCRIPTOR_EXIT_FLAG)
 } usable_descriptor_t;
 static void count_usable_descriptors(int *num_present,
  int *num_usable,
@@ -2110,8 +2117,11 @@ get_dir_info_status_string(void)
  * *num_present).
  *
  * If in_set is non-NULL, only consider those routers in in_set.
- * If exit_only is USABLE_DESCRIPTOR_EXIT_ONLY, only consider nodes
- * with the Exit flag.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
+ * with an exit policy that accepts at least one port.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
+ * with the exit flag in the consensus.
+ *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
  */
@@ -2132,11 +2142,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (!node)
  continue; /* This would be a bug: every entry in the consensus is
 * supposed to have a node. */
-   if (exit_only == USABLE_DESCRIPTOR_EXIT_ONLY && ! rs->is_exit)
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) && ! rs->is_exit)
  continue;
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
+ /* Do the policy check last, because it's potentially expensive */
+ if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+ node_has_preferred_descriptor(node, 0) &&
+ node_exit_policy_rejects_all(node)) {
+   continue;
+ }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2154,10 +2170,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  }
   SMARTLIST_FOREACH_END(rs);
 
-  log_debug(LD_DIR, "%d usable, %d present (%s%s).",
+  log_debug(LD_DIR, "%d usable, %d present (%s%s%s%s%s).",
 *num_usable, *num_present,
 md ? "microdesc" : "desc",
-exit_only == USABLE_DESCRIPTOR_EXIT_ONLY ? " exits" : "s");
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " exit" : "s",
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) ?
+  " policies" : "" ,
+(exit_only == USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " and" : "" ,
+(exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) ?
+  " flags": "" );
 }
 
 /** Return an estimate of which fraction of usable paths through the Tor
@@ -2207,15 +2230,9 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 });
   }
 
-  /* All nodes with exit flag
-   * If we're in a network with TestingDirAuthVoteExit set,
-   * this can cause false positives on have_consensus_path,
-   * incorrectly setting it to CONSENSUS_PATH_EXIT.

[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

2018-08-23 Thread nickm 
commit ced350882dc7fc7e66adce91f9514a7244f26c76
Merge: 573b6e4f2 fadcab920
Author: Nick Mathewson 
Date:   Thu Aug 23 14:22:30 2018 -0400

Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 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.3.4] Bootstrap: check the exit policy and flag on descriptors

2018-08-23 Thread nickm 
commit fadcab920bb0668a4ac0809467495f28ff112e76
Author: teor 
Date:   Fri Aug 24 00:10:52 2018 +1000

Bootstrap: check the exit policy and flag on descriptors

Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.

After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.

Fixes 27236; bugfix on 0.2.6.3-alpha.
---
 changes/bug27236  |  5 
 src/or/nodelist.c | 80 ---
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/changes/bug27236 b/changes/bug27236
new file mode 100644
index 0..76d792f4c
--- /dev/null
+++ b/changes/bug27236
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing, bootstrap):
+- When calculating bootstrap progress, check exit policies and the exit
+  flag. Previously, Tor would only check the exit flag, which caused
+  race conditions in small and fast networks like chutney.
+  Fixes bug 27236; bugfix on 0.2.6.3-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index ce1830083..85e4ae38d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -76,10 +76,17 @@ static void node_free_(node_t *node);
 /** count_usable_descriptors counts descriptors with these flag(s)
  */
 typedef enum {
-  /* All descriptors regardless of flags */
-  USABLE_DESCRIPTOR_ALL = 0,
-  /* Only descriptors with the Exit flag */
-  USABLE_DESCRIPTOR_EXIT_ONLY = 1
+  /* All descriptors regardless of flags or exit policies */
+  USABLE_DESCRIPTOR_ALL = 0U,
+  /* Only count descriptors with an exit policy that allows at least one port
+   */
+  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
+  /* Only count descriptors for relays that have the exit flag in the
+   * consensus */
+  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
+  /* Only count descriptors for relays that have the policy and the flag */
+  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
+USABLE_DESCRIPTOR_EXIT_FLAG)
 } usable_descriptor_t;
 static void count_usable_descriptors(int *num_present,
  int *num_usable,
@@ -2110,8 +2117,11 @@ get_dir_info_status_string(void)
  * *num_present).
  *
  * If in_set is non-NULL, only consider those routers in in_set.
- * If exit_only is USABLE_DESCRIPTOR_EXIT_ONLY, only consider nodes
- * with the Exit flag.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
+ * with an exit policy that accepts at least one port.
+ * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
+ * with the exit flag in the consensus.
+ *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
  */
@@ -2132,11 +2142,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (!node)
  continue; /* This would be a bug: every entry in the consensus is
 * supposed to have a node. */
-   if (exit_only == USABLE_DESCRIPTOR_EXIT_ONLY && ! rs->is_exit)
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) && ! rs->is_exit)
  continue;
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
+ /* Do the policy check last, because it's potentially expensive */
+ if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+ node_has_preferred_descriptor(node, 0) &&
+ node_exit_policy_rejects_all(node)) {
+   continue;
+ }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2154,10 +2170,17 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  }
   SMARTLIST_FOREACH_END(rs);
 
-  log_debug(LD_DIR, "%d usable, %d present (%s%s).",
+  log_debug(LD_DIR, "%d usable, %d present (%s%s%s%s%s).",
 *num_usable, *num_present,
 md ? "microdesc" : "desc",
-exit_only == USABLE_DESCRIPTOR_EXIT_ONLY ? " exits" : "s");
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " exit" : "s",
+(exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) ?
+  " policies" : "" ,
+(exit_only == USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG) ?
+  " and" : "" ,
+(exit_only & USABLE_DESCRIPTOR_EXIT_FLAG) ?
+  " flags": "" );
 }
 
 /** Return an estimate of which fraction of usable paths through the Tor
@@ -2207,15 +2230,9 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 });
   }
 
-  /* All nodes with exit flag
-   * If we're in a network with TestingDirAuthVoteExit set,
-   * this can cause false positives on have_consensus_path,
-   * incorrectly setting it to CONSENSUS_PATH_EXIT.

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

2018-08-23 Thread translation 
commit d591db2f546d24567ab309dcba149a56f9b4cf4f
Author: Translation commit bot 
Date:   Thu Aug 23 18:15:33 2018 +

Update translations for https_everywhere_completed
---
 sv/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index e7b8db169..79a323123 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

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

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

2018-08-23 Thread translation 
commit eb5d5863e7c86182ead67e18a64fe53a48d6ea49
Author: Translation commit bot 
Date:   Thu Aug 23 18:15:26 2018 +

Update translations for https_everywhere
---
 sv/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index e7b8db169..79a323123 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

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

  1   2   >