[tor-commits] [tor-browser-build/master] Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser

[gk]

commit 34626bda99acdcc94d45e7095313d6d3882cdd32
Author: Nicolas Vigier 
Date:   Fri Aug 30 18:45:23 2019 +0200

Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser
---
 projects/cbindgen/build |  9 ++---
 projects/debootstrap-image/config   |  7 ---
 projects/firefox/build  |  5 +
 projects/firefox/config |  6 +-
 projects/firefox/mozconfig-windows-i686 |  3 ---
 projects/gcc/build  |  1 -
 projects/gcc/config |  1 -
 projects/go/build   |  1 -
 projects/go/config  |  1 -
 projects/mingw-w64-clang/build  |  4 +---
 projects/mingw-w64/config   |  1 -
 projects/rust/build |  3 +--
 projects/rust/config|  5 +
 projects/webrtc/build   |  1 -
 rbm.conf| 14 ++
 15 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/projects/cbindgen/build b/projects/cbindgen/build
index 402a216..429f567 100644
--- a/projects/cbindgen/build
+++ b/projects/cbindgen/build
@@ -22,13 +22,8 @@ replace-with = "vendored-sources"
 directory = "/var/tmp/build/cbindgen/vendor"
 EOF
 
-[% IF ! c("var/windows-i686") -%]
-  target=x86_64
-[% ELSE -%]
-  target=i686
-[% END -%]
-cargo build --release --frozen --target $target-unknown-linux-gnu
-mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %]
+cargo build --release --frozen --target x86_64-unknown-linux-gnu
+mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %]
 
 cd $distdir
 [% c('tar', {
diff --git a/projects/debootstrap-image/config 
b/projects/debootstrap-image/config
index cad9c77..a50cbf1 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -65,13 +65,6 @@ targets:
 suite: stretch
 arch: amd64
 
-  stretch-i386:
-var:
-  minimal_apt_version: 1.4.9
-  container:
-suite: stretch
-arch: i386
-
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% 
c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
 filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
diff --git a/projects/firefox/build b/projects/firefox/build
index 1450576..87f8532 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -1,5 +1,4 @@
 #!/bin/bash
-[% c("var/setarch") -%]
 [% c("var/set_default_env") -%]
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => 
c('input_files_by_name/' _ c('var/compiler')) }) %]
 distdir=/var/tmp/dist/[% project %]
@@ -11,9 +10,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %]
   tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %]
   export PATH="/var/tmp/dist/fxc2/bin:$PATH"
   # fxc2 requires Wine.
-  [% IF c("var/windows-x86_64") %]
-export WINEARCH=win64
-  [% END %]
+  export WINEARCH=[% IF c("var/windows-x86_64") %]win64[% ELSE %]win32[% END %]
   export HOME=/var/tmp/home
   mkdir -p $HOME
   WINEROOT=$HOME/.wine/drive_c
diff --git a/projects/firefox/config b/projects/firefox/config
index b13635c..334a1a8 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -111,11 +111,15 @@ targets:
   arch_deps:
 - wine
   pre_pkginst: |
+[% IF c("var/windows-i686") -%]
+  # We need this to install wine32
+  dpkg --add-architecture i386
+[% END -%]
 echo 'deb http://ftp.debian.org/debian stretch-backports main' >> 
/etc/apt/sources.list
   post_pkginst: |
 # We need to have at least 3.0.3 which Mozilla is using in the
 # mingw-w64/clang build process
-apt-get -y -t stretch-backports install wine
+apt-get -y -t stretch-backports install wine[% IF 
c("var/windows-i686") %]32[% END %]
   compiler: mingw-w64-clang
 
   windows-i686:
diff --git a/projects/firefox/mozconfig-windows-i686 
b/projects/firefox/mozconfig-windows-i686
index 5538bc1..eaa704f 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -24,9 +24,6 @@ export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --disable-debug
-# Until we build on a 64bit host we need to hack around linker errors due to
-# memory constraints
-ac_add_options --disable-debug-symbols
 ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --enable-official-branding
diff --git a/projects/gcc/build b/projects/gcc/build
index 1d055b4..bd7e837 100644
--- a/projects/gcc/build
+++ b/projects/gcc/build
@@ -1,6 +1,5 @@
 #!/bin/sh
 [% c("var/set_default_env") -%]
-[% c("var/setarch") -%]
 [% IF c("var/linux") -%]
   # Config options for hardening-wrapper
   export DEB_BUILD_HARDENING=1
diff --git a/projects/gcc/config b/projects/gcc/config
index 9fef3c4..d776a2c 100644
--- a/projects/gcc/config
+++ b/projects

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 77b769d1fe8b3a8ddb16ca1d91527610b146c038
Author: Translation commit bot 
Date:   Fri Sep 6 04:48:36 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 5861ff345..0756c88c0 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -33,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-09-06 04:23+\n"
+"Last-Translator: Chacal E.\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 98b593bbe238f76673f351e5b42a0cf73fd23dad
Author: Translation commit bot 
Date:   Fri Sep 6 04:47:22 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 pt_BR.po | 314 +++
 1 file changed, 157 insertions(+), 157 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 5861ff345..e1b1871d9 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -33,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-09-06 04:23+\n"
+"Last-Translator: Chacal E.\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,19 +70,19 @@ msgstr "Ajude a consertar o erro que você 
encontrou!\nLeia Synaptic Package Manager or APT on the command line."
-msgstr ""
+msgstr "Para adicionar outros, instale software usando Gerenciador de Pacotes Synaptic ou o APT na linha de comandos."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "_Crie armazenamento persistente"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
@@ -124,38 +124,38 @@ msgstr "_Saída"
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:386
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
 msgid "Direct (default)"
-msgstr ""
+msgstr "Direta (padrão)"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:392
 msgid "Bridge & Proxy"
-msgstr ""
+msgstr "Ponte & Proxy"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:398
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:479
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:529
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
 msgid "Unlock"
-msgstr ""
+msgstr "Desbloquear"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482
 msgid "Failed to relock persistent storage."
-msgstr ""
+msgstr "Falha ao rebloquear o volume de armazenamento persistente."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500
 msgid "Unlocking…"
-msgstr ""
+msgstr "Desbloqueando..."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
 msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
+msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado 
com esta frase secreta"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595
 msgid "Additional Settings"
-msgstr ""
+msgstr "Configurações Adicionais"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:603
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
@@ -166,32 +166,32 @@ msgstr "Cancelar"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617
 msgid "Back"
-msgstr ""
+msgstr "Anterior"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731
 msgid "Shutdown"
-msgstr ""
+msgstr "Encerrar"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736
 msgid "_Start Tails"
-msgstr ""
+msgstr "_Iniciar Tails"
 
 #. Translators: please do not translate this string (it is read from
 #. Gtk translation)
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py:139
 msgid "default:LTR"
-msgstr ""
+msgstr "default:LTR"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
-msgstr ""
+msgstr "live-persist não conseguiu retornar o código {returncode]:\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141
@@ -200,7 +200,7 @@ msgid ""
 "cryptsetup failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "cryptsetup não conseguiu retornar o código  
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-i

[tor-commits] [tpo/master] update volunteer contact link

[antonela]

commit de183aa009787660793cc8e6e15a1cb0b85c10fc
Author: Antonela 
Date:   Thu Sep 5 21:34:10 2019 -0400

update volunteer contact link

close https://dip.torproject.org/web/tpo/issues/29
---
 templates/contact.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/contact.html b/templates/contact.html
index 71af4bd..bd87b90 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -38,7 +38,7 @@
   
   
 
-  https://2019.www.torproject.org/getinvolved/volunteer"; target="_blank" 
title="{{ _('Get Involved') }}">{{ _('Get Involved') }}
+  https://community.torproject.org/"; 
target="_blank" title="{{ _('Get Involved') }}">{{ _('Get Involved') 
}}
 
   
 

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

[tor-commits] [tpo/master] Add README.md with contrib, how to build lektor, bug report instructions

[antonela]

commit c59be60026bfaa1ac7bea73b62030006d5901390
Author: Antonela 
Date:   Thu Sep 5 21:08:05 2019 -0400

Add README.md with contrib, how to build lektor, bug report instructions

close https://dip.torproject.org/web/tpo/issues/38
---
 README.md | 63 +++
 1 file changed, 63 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..6a3d132
--- /dev/null
+++ b/README.md
@@ -0,0 +1,63 @@
+# Tor Project Website
+
+This is the repository of Tor Project website. The current online version of 
this portal can be found at [https://torproject.org](https://torproject.org) or 
[Tor Project Onion Service](http://expyuzz4wqqyqhjn.onion/).
+
+To clone the code use either of
+
+```git clone https://git.torproject.org/project/web/tpo.git/```
+
+```torify git clone http://dccbbv6cooddgcrq.onion/project/web/tpo.git/```
+
+or browse it [online](http://gitweb.torproject.org/project/web/tpo.git).
+
+## How to report bugs or feedback
+
+First check if your issue wasn't already opened in 
[dip.torproject.org](https://dip.torproject.org/web/tpo/issues), then file a 
[trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose 
the component: Webpages/Website.
+
+
+## What is Lektor
+
+[Lektor](https://www.getlektor.com/) is a framework to generate and serve 
websites from Markdown files.
+
+Its code can be found at [GitHub](https://github.com/lektor/lektor).
+
+## How to contribute
+
+### (Easy) Edit this page button
+
+You can click ```Edit this page``` and submit your content changes in a [Pull 
Request in GitHub](https://github.com/torproject/community/pulls).
+
+### (Advanced) Compiling a local version of the website
+
+1. Download and install Lektor: https://www.getlektor.com/downloads/
+
+2. Install the lektor-i18n plugin and its 
[dependencies](https://github.com/numericube/lektor-i18n-plugin#prerequisites).
+
+3. Clone the repository:
+
+```git clone https://git.torproject.org/project/web/tpo.git```
+
+4. Init the building blocks submodule:
+
+```$ cd lego && git submodule update --init --recursive```
+
+5. Translations for the website are imported by Jenkins when bulding the page, 
but if you want to test them, download the correct branch of the translations 
repo to the ./i18n/ folder.
+
+6. Finally
+
+To run a local continuous builder: ```$ lektor server```
+
+To just build the website once: ```$ lektor build -O ```
+
+ How to develop on the website
+
+Check our [wiki 
pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the-website).
+
+### Translations
+
+To help us to translate, please join the Tor Project team in 
[Transifex](https://www.transifex.com/).
+
+
+### Getting help
+
+If you want to contribute to the Tor Project website, we will be happy to help 
you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net).

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

[tor-commits] [lego/master] fix padding in page container

[antonela]

commit 094dd93359d24f87c74eaa932de7f3214dd9
Author: Antonela 
Date:   Thu Sep 5 20:59:55 2019 -0400

fix padding in page container
---
 assets/scss/_tor.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss
index c73909d..b673e5e 100644
--- a/assets/scss/_tor.scss
+++ b/assets/scss/_tor.scss
@@ -2,9 +2,9 @@
  * Base structure
  */
 
-/* Move down content because we have a fixed navbar that is 3.5rem tall */
+/* Move down content because we have a fixed navbar that is 10rem tall */
 .page {
-  padding-top: 3.5rem;
+  padding-top: 10rem;
 }
 
 /* Reset */

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

[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage

[translation]

commit 38a05ad6b2ddda1eca0359495c6c19573bab80da
Author: Translation commit bot 
Date:   Thu Sep 5 23:15:06 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 nl/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index b4ac52c46..aba1d4600 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 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/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

[translation]

commit ee2257047b260cdd4f50531d3163986d5de5f97b
Author: Translation commit bot 
Date:   Thu Sep 5 21:45:17 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 bs/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index a2656f12e..34fda4286 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-08-13 12:55+\n"
+"PO-Revision-Date: 2019-09-05 21:29+\n"
 "Last-Translator: Amar Memisevic \n"
 "Language-Team: Bosnian 
(http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -225,7 +225,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you 
are\n"
 "using Tor.\n"
 "\n"
-msgstr ""
+msgstr "BridgeDB može pružiti mostove s nekoliko%svrsta priključnih 
priključaka%s,\nšto može pomoći zamagli vaše veze sa Tor mreže, što je 
više\nsvima koji gledaju vaš internetski promet teško je utvrditi kakvi 
ste\nkoristeći Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -233,7 +233,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr ""
+msgstr "Dostupni su i neki briđevi s IPv6 adresama, iako su neki 
Modularni\nTranspori nisu IPV6 kompatibilni.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,

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

[tor-commits] [lego/master] donate button points to the donate.torproject.org right locale

[antonela]

commit 54d5eb63e4c1853fd44f25de69f1091d4670e72b
Author: Antonela 
Date:   Thu Sep 5 17:07:29 2019 -0400

donate button points to the donate.torproject.org right locale

close https://dip.torproject.org/web/tpo/issues/14
---
 templates/navbar.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/navbar.html b/templates/navbar.html
index 7600885..287e178 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -12,7 +12,9 @@
   
   Tor Logo
 
-https://donate.torproject.org"; title="{{ _("Donate") 
}}">{{ _("Donate Now") 
}}
+   
+https://donate.torproject.org/{{ '/'|url(alt=this.alt) }}" 
title="{{ _("Donate") }}">{{ 
_("Donate Now") }}
+
 
   
 {{ _("Menu") }} 

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

[tor-commits] [translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed

[translation]

commit 87512116f999654bcb2e0677373c37d61000ef46
Author: Translation commit bot 
Date:   Thu Sep 5 19:47:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
---
 mk/index.html | 86 +++
 1 file changed, 86 insertions(+)

diff --git a/mk/index.html b/mk/index.html
new file mode 100644
index 0..88a5915d8
--- /dev/null
+++ b/mk/index.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+Snowflake
+
+
+
+https://www.torproject.org/";>
+   
+
+  SNOWFLAKE
+
+  
+
+  Snowflake е систем кој ја поразува 
интернет цензурата. Луѓето кои се
+цензурирани може да го користат Snowflake за да 
пристапуваат на Интернет. Нивното 
поврзување оди
+преку Snowflake проксија, кои се водени од 
волонтери, За подетални
+информации за тоа како работи Snowflake видете 
ја нашата
+  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>wiki 
документација.
+
+  
+
+
+  Прелистувач
+
+  Ако вашиот пристап на Интернет е 
цензуриран, треба да го преземете
+  https://www.torproject.org/download/";>Tor Browser.
+
+  
+
+
+
+  Проширување
+
+  Ако вашиот Интернет пристап е 
не цензуриран, би можеле
+да размислите да гоинсталирате Snowflake 
проширувањето за да им помогнете на 
корисниците на цензурираните
+мрежи. Нема потребе да се грижите за тоа на 
која веб страна луѓето и
+пристапуваат преку вашето прокси. Нивната 
видлива IP адреса за прелистување ќе
+одговоара со нивниот излезен Tor јазол, а не 
со вашиот.
+
+  https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
+ Инсталирај во Firefox
+
+https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie";>
+ Инсталирај во Chrome
+
+
+
+
+  
+
+  ПРИЈАВУВАЊЕ НА ГРЕШКИ
+  
+  Ако се судрите со проблеми со Snowflake 
како клиент или како пркси,
+  ве молиме размислете да пријавите 
грешка. За да го сторите тоа, треба да,
+  
+  
+Или да https://trac.torproject.org/projects/tor/register";>создадете
+сметка или https://trac.torproject.org/projects/tor/login";>да се 
најавите
+користејќи ја споделената 
енкриптерска сметка со лозинка  внеси 
код .
+
+https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake";>Пополни
 рапорт
+   користејќи го нашиот следач на 
грешки.
+  
+Ве молиме обидете се да бидете што е 
можно појасни во вашиот рапорт и ако
+  е можно вклучете ги логовите кои ќе ни 
помогнат да ја произведеме истата грешка.
+  Размислете за доддавање на клучни 
зборови snowflake-webextension или snowflake-client
+  како би ни кажале во кој дел од Snowflake 
системот се сретнавте со
+  проблеми.
+
+  ВГРАДИ
+
+  Сега е можно да го вградиш Snowflake беџот 
на било која веб страна:
+
+  Кој 
изгледа вака:
+
+  
+
+
+  
+
+
+

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

[translation]

commit 6350df0eae973a080a385bedcf528e71c12cda02
Author: Translation commit bot 
Date:   Thu Sep 5 19:47:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 mk/index.html | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mk/index.html b/mk/index.html
index 52df75213..88a5915d8 100644
--- a/mk/index.html
+++ b/mk/index.html
@@ -58,24 +58,24 @@
   ве молиме размислете да пријавите 
грешка. За да го сторите тоа, треба да,
   
   
-Either https://trac.torproject.org/projects/tor/register";>create 
an
-account or https://trac.torproject.org/projects/tor/login";>log in
-using the shared cypherpunks account with password 
writecode.
+Или да https://trac.torproject.org/projects/tor/register";>создадете
+сметка или https://trac.torproject.org/projects/tor/login";>да се 
најавите
+користејќи ја споделената 
енкриптерска сметка со лозинка  внеси 
код .
 
-https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake";>File
 a ticket
-using our bug tracker.
+https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake";>Пополни
 рапорт
+   користејќи го нашиот следач на 
грешки.
   
-Please try to be as descriptive as possible with your ticket and if
-  possible include log messages that will help us reproduce the bug.
-  Consider adding keywords snowflake-webextension or 
snowflake-client
-  to let us know how which part of the Snowflake system is experiencing
-  problems.
+Ве молиме обидете се да бидете што е 
можно појасни во вашиот рапорт и ако
+  е можно вклучете ги логовите кои ќе ни 
помогнат да ја произведеме истата грешка.
+  Размислете за доддавање на клучни 
зборови snowflake-webextension или snowflake-client
+  како би ни кажале во кој дел од Snowflake 
системот се сретнавте со
+  проблеми.
 
-  EMBED
+  ВГРАДИ
 
-  It is now possible to embed the Snowflake badge on any website:
+  Сега е можно да го вградиш Snowflake беџот 
на било која веб страна:
 
-  Which looks like 
this:
+  Кој 
изгледа вака:
 
   
 

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

[translation]

commit 69def4ae09c64a7e837ee908542bc8227168ec77
Author: Translation commit bot 
Date:   Thu Sep 5 19:17:03 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 mk/messages.json | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mk/messages.json b/mk/messages.json
index 6b79fa467..14e6a5077 100644
--- a/mk/messages.json
+++ b/mk/messages.json
@@ -1,6 +1,6 @@
 {
   "appDesc": {
-"message": "Snowflake е WebRTC приклучок за транспорт 
за Tor."
+"message": "Snowflake е WebRTC pluggable transport за Tor."
   },
   "popupTurnOn": {
 "message": "Вклучи"
@@ -9,24 +9,24 @@
 "message": "Исклучи"
   },
   "popupLearnMore": {
-"message": "Научи повеќе"
+"message": "Научете повеќе"
   },
   "popupStatusOff": {
 "message": "Snowflake е исклучен"
   },
   "popupStatusOn": {
-"message": "Број на поврзани корисници во 
моментот: $1"
+"message": "Број на корисници кои се поврзани 
во моментов: $1"
   },
   "popupStatusReady": {
-"message": "Вашиот Snowflake е спремен да им 
помогне на корисниците да ја заобиколаат 
цензурата"
+"message": "Вашиот Snowflake е подготвен да им 
помогне на корисниците да ја заобиколат 
цензурата"
   },
   "popupWebRTCOff": {
-"message": "WebRTC функција не е детектирана."
+"message": "WebRTC карактеристиката не е 
детектирана."
   },
   "popupDescOn": {
-"message": "Број на корисници вашиот Snowflake има 
помогнато да ја заобиколаат цензурата во 
последните 24 часа: $1"
+"message": "Број на корисници кој вашиот Snowflake 
им помогнал да ја заобиколаат цензурата во 
последните 24 часа: $1"
   },
   "badgeCookiesOff": {
-"message": "Колачиња не се овозможени"
+"message": "Колачињата не се овозможени."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

[translation]

commit 5e149454049a6f89c068d4a1d103dae135d57c93
Author: Translation commit bot 
Date:   Thu Sep 5 19:17:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 mk/messages.json | 32 
 1 file changed, 32 insertions(+)

diff --git a/mk/messages.json b/mk/messages.json
new file mode 100644
index 0..14e6a5077
--- /dev/null
+++ b/mk/messages.json
@@ -0,0 +1,32 @@
+{
+  "appDesc": {
+"message": "Snowflake е WebRTC pluggable transport за Tor."
+  },
+  "popupTurnOn": {
+"message": "Вклучи"
+  },
+  "popupTurnOff": {
+"message": "Исклучи"
+  },
+  "popupLearnMore": {
+"message": "Научете повеќе"
+  },
+  "popupStatusOff": {
+"message": "Snowflake е исклучен"
+  },
+  "popupStatusOn": {
+"message": "Број на корисници кои се поврзани 
во моментов: $1"
+  },
+  "popupStatusReady": {
+"message": "Вашиот Snowflake е подготвен да им 
помогне на корисниците да ја заобиколат 
цензурата"
+  },
+  "popupWebRTCOff": {
+"message": "WebRTC карактеристиката не е 
детектирана."
+  },
+  "popupDescOn": {
+"message": "Број на корисници кој вашиот Snowflake 
им помогнал да ја заобиколаат цензурата во 
последните 24 часа: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Колачињата не се овозможени."
+  }
+}

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

[translation]

commit 0c343d52595d75b8f3dd48f594c00961478db02b
Author: Translation commit bot 
Date:   Thu Sep 5 19:17:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 mk/index.html | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/mk/index.html b/mk/index.html
index 500a4ce32..52df75213 100644
--- a/mk/index.html
+++ b/mk/index.html
@@ -9,53 +9,53 @@
 
 
 https://www.torproject.org/";>
-
+   
 
-  СНЕГУЛКА
+  SNOWFLAKE
 
   
 
-  Snowflake is a system to defeat internet censorship. People who are
-  censored can use Snowflake to access the internet. Their connection goes
-  through Snowflake proxies, which are run by volunteers. For more detailed
-  information about how Snowflake works see our
-  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>documentation
 wiki.
+  Snowflake е систем кој ја поразува 
интернет цензурата. Луѓето кои се
+цензурирани може да го користат Snowflake за да 
пристапуваат на Интернет. Нивното 
поврзување оди
+преку Snowflake проксија, кои се водени од 
волонтери, За подетални
+информации за тоа како работи Snowflake видете 
ја нашата
+  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>wiki 
документација.
 
   
 
 
   Прелистувач
 
-  Ако вашиот пристап кон интернет е 
цензуриран, можеби треба да го превземете
-  https://www.torproject.org/download/";>Tor 
Прелистувачот.
+  Ако вашиот пристап на Интернет е 
цензуриран, треба да го преземете
+  https://www.torproject.org/download/";>Tor Browser.
 
   
 
 
 
-  Extension
+  Проширување
 
-  If your internet access is not censored, you 
should
-  consider installing the Snowflake extension to help users in censored
-  networks. There is no need to worry about which websites people are
-  accessing through your proxy. Their visible browsing IP address will
-  match their Tor exit node, not yours.
+  Ако вашиот Интернет пристап е 
не цензуриран, би можеле
+да размислите да гоинсталирате Snowflake 
проширувањето за да им помогнете на 
корисниците на цензурираните
+мрежи. Нема потребе да се грижите за тоа на 
која веб страна луѓето и
+пристапуваат преку вашето прокси. Нивната 
видлива IP адреса за прелистување ќе
+одговоара со нивниот излезен Tor јазол, а не 
со вашиот.
 
   https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
-  Инсталирај за Firefox
+ Инсталирај во Firefox
 
 https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie";>
-  Инсталирај за Chrome
+ Инсталирај во Chrome
 
 
 
 
   
 
-  REPORTING BUGS
+  ПРИЈАВУВАЊЕ НА ГРЕШКИ
   
-  If you encounter problems with Snowflake as a client or a proxy,
-  please consider filing a bug.  To do so, you will have to,
+  Ако се судрите со проблеми со Snowflake 
како клиент или како пркси,
+  ве молиме размислете да пријавите 
грешка. За да го сторите тоа, треба да,
   
   
 Either https://trac.torproject.org/projects/tor/register";>create 
an

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

[translation]

commit 83370e63d7ac98824236db1be2419f53fdc4c708
Author: Translation commit bot 
Date:   Thu Sep 5 18:47:03 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 mk/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/messages.json b/mk/messages.json
index 2999c3367..6b79fa467 100644
--- a/mk/messages.json
+++ b/mk/messages.json
@@ -3,7 +3,7 @@
 "message": "Snowflake е WebRTC приклучок за транспорт 
за Tor."
   },
   "popupTurnOn": {
-"message": "Уклучи"
+"message": "Вклучи"
   },
   "popupTurnOff": {
 "message": "Исклучи"

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

[translation]

commit a1a43332251b532b9c32bb3989674d4210b8beb9
Author: Translation commit bot 
Date:   Thu Sep 5 18:17:07 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 he/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/messages.json b/he/messages.json
index 91074d74e..7f37073e2 100644
--- a/he/messages.json
+++ b/he/messages.json
@@ -18,7 +18,7 @@
 "message": "מספר של משתמשים המחוברים כרגע: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship"
+"message": "Snowflake שלך מוכן לעזור למשתמשים 
לעקוף צנזורה"
   },
   "popupWebRTCOff": {
 "message": "איפיון WebRTC לא התגלה."

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

[translation]

commit 3d36a887923b99e46039a4fcb24d44bf1816d834
Author: Translation commit bot 
Date:   Thu Sep 5 18:17:12 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 he/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/messages.json b/he/messages.json
index f9de9d4cc..f6ed740cf 100644
--- a/he/messages.json
+++ b/he/messages.json
@@ -18,7 +18,7 @@
 "message": "Number of users currently connected: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship!"
+"message": "Your Snowflake is ready to help users circumvent censorship"
   },
   "popupWebRTCOff": {
 "message": "WebRTC feature is not detected."

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

[tor-commits] [lego/master] Replace trademark faq links

[emmapeel]

commit 60e28b3672fedaf065e69ec92f03efc12f079a6d
Author: sabita <35147757+sabita...@users.noreply.github.com>
Date:   Thu Sep 5 21:18:40 2019 +0530

Replace trademark faq links

Fixes 1 of 2 tasks in https://dip.torproject.org/web/tpo/issues/37
---
 templates/macros/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/macros/footer.html b/templates/macros/footer.html
index 90b9dfd..e3c90c8 100644
--- a/templates/macros/footer.html
+++ b/templates/macros/footer.html
@@ -1,3 +1,3 @@
 {% macro render_faq() %}
-  https://www.torproject.org/docs/trademark-faq"; target="_blank" 
class="text-primary text-light">FAQ
+  https://www.torproject.org/about/trademark/"; target="_blank" 
class="text-primary text-light">FAQ
 {% endmacro %}

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

[tor-commits] [tpo/master] add #tor-ux channel

[emmapeel]

commit 40bc43a2fc10df9129ff7ab0446cd11e913aa836
Author: sabita <35147757+sabita...@users.noreply.github.com>
Date:   Thu Sep 5 20:10:23 2019 +0530

add #tor-ux channel

Fixes https://dip.torproject.org/web/tpo/issues/36
---
 templates/contact.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/contact.html b/templates/contact.html
index b519fc1..dec2d49 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -10,10 +10,11 @@
   #tor-dev - {{ 
_("Discuss Tor-related coding and protocols. Ideas are welcome.") }}
   #tor-l10n - 
{{ _("Get in touch with other translators") }}
   #tor-meeting 
- {{ _("Watch or join publicly logged team meetings.") }}
-  #tor-project 
- {{ _("Discuss organization and community related topics: meetups, outreach, 
translation, or website improvements.") }}
+  #tor-project 
- {{ _("Discuss organization and community related topics: meetups, outreach, 
and translation.") }}
   #tor-relays - 
{{ _("Discuss running a Tor relay.") }}
   #tor-south - 
{{ _("Talk with Tor's global south community.") }}
-  #tor-www - {{ 
_("Talk with us about our portals.") }}
+  #tor-www - {{ 
_("Talk with us about improvements on our websites.") }}
+  #tor-ux - {{ 
_("Discuss UX related ideas.") }}
 
 
   



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

[tor-commits] [tpo/master] In contact section add #tor-ux channel

[emmapeel]

commit 6fd9b34039c1904f5a7685879fa9d7744b0e287a
Author: sabita <35147757+sabita...@users.noreply.github.com>
Date:   Thu Sep 5 21:23:59 2019 +0530

In contact section add #tor-ux channel

Fixes https://dip.torproject.org/web/tpo/issues/36

Updated to remove 'translations' also from #tor-project.
---
 templates/contact.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/contact.html b/templates/contact.html
index dec2d49..71af4bd 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -10,7 +10,7 @@
   #tor-dev - {{ 
_("Discuss Tor-related coding and protocols. Ideas are welcome.") }}
   #tor-l10n - 
{{ _("Get in touch with other translators") }}
   #tor-meeting 
- {{ _("Watch or join publicly logged team meetings.") }}
-  #tor-project 
- {{ _("Discuss organization and community related topics: meetups, outreach, 
and translation.") }}
+  #tor-project 
- {{ _("Discuss organization and community related topics: meetups and 
outreach.") }}
   #tor-relays - 
{{ _("Discuss running a Tor relay.") }}
   #tor-south - 
{{ _("Talk with Tor's global south community.") }}
   #tor-www - {{ 
_("Talk with us about improvements on our websites.") }}

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

[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed

[translation]

commit c62b170f4c81a6f02cc42b4312c3240d63c778d6
Author: Translation commit bot 
Date:   Thu Sep 5 16:25:56 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+fr.po| 469 ++-
 contents+tr.po| 468 ++-
 contents+zh-CN.po | 437 ++--
 contents.pot  | 490 +-
 4 files changed, 382 insertions(+), 1482 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 6f07c0331..e5846f102 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-03 12:45+CET\n"
+"POT-Creation-Date: 2019-09-05 18:00+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -2310,6 +2310,53 @@ msgstr ""
 "la confidentialité ni la protection des données personnelles offertes par 
le"
 " Navigateur Tor."
 
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.title)
+msgid ""
+"What is the difference between using Tor Browser and 'Incognito mode' or "
+"private tabs?"
+msgstr ""
+
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
+msgid ""
+"While the names may imply otherwise, 'Incognito mode' and 'private tabs' do "
+"not make you anonymous on the Internet."
+msgstr ""
+
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
+msgid ""
+"They erase all the information on your machine relating to the browsing "
+"session after they are closed, but have no measures in place to hide your "
+"activity or digital fingerprint online."
+msgstr ""
+
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
+msgid ""
+"This means that an observer can collect your traffic just as easily as any "
+"regular browser."
+msgstr ""
+
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
+msgid ""
+"Tor Browser offers all the amnesic features of private tabs while also "
+"hiding the source IP, browsing habits and details about a device that can be"
+" used to fingerprint activity across the web, allowing for a truly private "
+"browsing session that's fully obfuscated from end-to-end."
+msgstr ""
+
+#: https//support.torproject.org/tbb/tbb-and-incognito-mode/
+#: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
+msgid ""
+"For more information regarding the limitations of Incognito mode and private"
+" tabs, see Mozilla's article on [Common Myths about Private "
+"Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-private-";
+"browsing)."
+msgstr ""
+
 #: https//support.torproject.org/tormessenger/tormessenger-1/
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.title)
 msgid "Does Tor Project make an application for private chat?"
@@ -2422,11 +2469,16 @@ msgstr ""
 #: https//support.torproject.org/tormobile/tormobile-3/
 #: (content/tormobile/tormobile-3/contents+en.lrquestion.description)
 msgid ""
-"https://blog.torproject.org/tor-heart-onion-browser-and-";
-"more-ios-tor\">Learn more about Onion Browser."
+"[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-";
+"onion-browser-and-more-ios-tor)."
+msgstr ""
+
+#: https//support.torproject.org/tormobile/tormobile-3/
+#: (content/tormobile/tormobile-3/contents+en.lrquestion.description)
+msgid ""
+"Download Onion Browser from the [App Store](https://itunes.apple.com/us/app";
+"/onion-browser/id519296448)."
 msgstr ""
-"https://blog.torproject.org/tor-heart-onion-browser-and-";
-"more-ios-tor\">En apprendre davantage sur le Navigateur Onion."
 
 #: https//support.torproject.org/tormobile/tormobile-4/
 #: (content/tormobile/tormobile-4/contents+en.lrquestion.title)
@@ -2500,6 +2552,25 @@ msgstr ""
 "risquent moins d’être censurés, tels que les services nuagiques Dropbox 
et "
 "Google Drive, ou sur GitHub."
 
+#: https//support.torproject.org/gettor/gettor-1/
+#: (content/gettor/gettor-1/contents+en.lrquestion.description)
+#: https//support.torproject.org/censorship/censorship-3/
+#: (content/censorship/censorship-3/contents+en.lrquestion.description)
+msgid ""
+"You can also download Tor Browser from "
+"[https://tor.eff.org](https://tor.eff.org) or from "
+"[https://tor.ccc.de](https://tor.ccc.de)."
+msgstr ""
+
+#: https//support.torproject.org/gettor/gettor-1/
+#: (content/gettor/gettor-1/contents+en.lrquestion.description)
+#: https//su

[tor-commits] [webwml/master] Use permalink instead

[hiro]

commit 25dba7f876ff78f9a45c02327154d04a465fa6e3
Author: hiro 
Date:   Thu Sep 5 17:55:07 2019 +0200

Use permalink instead
---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index bdf8ee93..b626cb88 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ RewriteRule ^verifying-signatures(.*) 
/docs/verifying-signatures$1 [R=301,L]
 RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
 
 # docs
-RewriteRule ^docs/verifying-signatures(.*) 
https://support.torproject.org/#how-to-verify-signature [R=302,L]
+RewriteRule ^docs/verifying-signatures(.*) 
https://support.torproject.org/tbb/how-to-verify-signature/ [R=302,L]
 
 # Torbutton
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]

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

[tor-commits] [webwml/master] Remove char

[hiro]

commit c6cbabd5782e8204ccd390987f173fe04506372f
Author: hiro 
Date:   Thu Sep 5 17:42:13 2019 +0200

Remove char
---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 25e5d931..bdf8ee93 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ RewriteRule ^verifying-signatures(.*) 
/docs/verifying-signatures$1 [R=301,L]
 RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
 
 # docs
-RewriteRule ^docs/verifying-signatures(.*) 
​https://support.torproject.org/#how-to-verify-signature [R=302,L]
+RewriteRule ^docs/verifying-signatures(.*) 
https://support.torproject.org/#how-to-verify-signature [R=302,L]
 
 # Torbutton
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]

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

[tor-commits] [webwml/master] Fix typo

[hiro]

commit c4e6174f6ee13e4831c4851574000a3206fe025f
Author: hiro 
Date:   Thu Sep 5 17:33:41 2019 +0200

Fix typo
---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index b049ced8..25e5d931 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ RewriteRule ^verifying-signatures(.*) 
/docs/verifying-signatures$1 [R=301,L]
 RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
 
 # docs
-RewriteRule ^docs/verifying-signatures(.*) to 
​https://support.torproject.org/#how-to-verify-signature [R=302,L]
+RewriteRule ^docs/verifying-signatures(.*) 
​https://support.torproject.org/#how-to-verify-signature [R=302,L]
 
 # Torbutton
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]

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

[tor-commits] [styleguide/master] Update assets symlinks

[hiro]

commit c101babeb1dfbdb58d281d42d78e1420461c68e1
Author: hiro 
Date:   Thu Sep 5 16:50:20 2019 +0200

Update assets symlinks
---
 assets/javascript   | 2 +-
 assets/scss | 1 +
 assets/static/css   | 2 +-
 assets/static/fonts | 2 +-
 assets/static/js| 2 +-
 lego| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assets/javascript b/assets/javascript
index c8db05e..f1da3c5 12
--- a/assets/javascript
+++ b/assets/javascript
@@ -1 +1 @@
-../lego/assests/javascript
\ No newline at end of file
+../lego/assets/javascript
\ No newline at end of file
diff --git a/assets/scss b/assets/scss
new file mode 12
index 000..2d8ed2e
--- /dev/null
+++ b/assets/scss
@@ -0,0 +1 @@
+../lego/assets/scss
\ No newline at end of file
diff --git a/assets/static/css b/assets/static/css
index 0db4948..12e4567 12
--- a/assets/static/css
+++ b/assets/static/css
@@ -1 +1 @@
-../../lego/assests/static/css
\ No newline at end of file
+../../lego/assets/static/css
\ No newline at end of file
diff --git a/assets/static/fonts b/assets/static/fonts
index 2da38c7..25deee7 12
--- a/assets/static/fonts
+++ b/assets/static/fonts
@@ -1 +1 @@
-../../lego/assests/static/fonts
\ No newline at end of file
+../../lego/assets/static/fonts
\ No newline at end of file
diff --git a/assets/static/js b/assets/static/js
index 7b741e3..361859a 12
--- a/assets/static/js
+++ b/assets/static/js
@@ -1 +1 @@
-../../lego/assests/static/js
\ No newline at end of file
+../../lego/assets/static/js
\ No newline at end of file
diff --git a/lego b/lego
index aa31aec..3d80025 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17
+Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763

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

[tor-commits] [metrics-lib/master] Add new SnowflakeStats descriptor type.

[karsten]

commit dc946fe1c8b50386f60f29a5073046eb2c0b27ad
Author: Karsten Loesing 
Date:   Tue Aug 13 15:01:45 2019 +0200

Add new SnowflakeStats descriptor type.

Implements #29461.
---
 CHANGELOG.md   |   1 +
 .../org/torproject/descriptor/SnowflakeStats.java  |  86 ++
 .../descriptor/impl/DescriptorParserImpl.java  |   5 +
 .../java/org/torproject/descriptor/impl/Key.java   |   6 +
 .../torproject/descriptor/impl/ParseHelper.java|  21 +++
 .../descriptor/impl/SnowflakeStatsImpl.java| 185 +
 .../org/torproject/descriptor/DescriptorTest.java  |   7 +-
 .../descriptor/impl/SnowflakeStatsImplTest.java| 137 +++
 src/test/resources/snowflake/example_metrics.log   |  12 ++
 9 files changed, 459 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b804ceb..2fdc45b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
  versions resolved by Ivy are the same as in Debian stretch with
  few exceptions.
- Remove Cobertura from the build process.
+   - Add new SnowflakeStats descriptor type.
 
 
 # Changes in version 2.6.2 - 2019-05-29
diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java 
b/src/main/java/org/torproject/descriptor/SnowflakeStats.java
new file mode 100644
index 000..379a0f7
--- /dev/null
+++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java
@@ -0,0 +1,86 @@
+/* Copyright 2019 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.descriptor;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Optional;
+import java.util.SortedMap;
+
+/**
+ * Contain aggregated information about snowflake proxies and snowflake 
clients.
+ *
+ * @since 2.7.0
+ */
+public interface SnowflakeStats extends Descriptor {
+
+  /**
+   * Return the end of the included measurement interval.
+   *
+   * @return End of the included measurement interval.
+   * @since 2.7.0
+   */
+  LocalDateTime snowflakeStatsEnd();
+
+  /**
+   * Return the length of the included measurement interval.
+   *
+   * @return Length of the included measurement interval.
+   * @since 2.7.0
+   */
+  Duration snowflakeStatsIntervalLength();
+
+  /**
+   * Return a list of mappings from two-letter country codes to the number of
+   * unique IP addresses of snowflake proxies that have polled.
+   *
+   * @return List of mappings from two-letter country codes to the number of
+   * unique IP addresses of snowflake proxies that have polled.
+   * @since 2.7.0
+   */
+  Optional> snowflakeIps();
+
+  /**
+   * Return a count of the total number of unique IP addresses of snowflake
+   * proxies that have polled.
+   *
+   * @return Count of the total number of unique IP addresses of snowflake
+   * proxies that have polled.
+   * @since 2.7.0
+   */
+  Optional snowflakeIpsTotal();
+
+  /**
+   * Return a count of the number of times a proxy has polled but received no
+   * client offer, rounded up to the nearest multiple of 8.
+   *
+   * @return Count of the number of times a proxy has polled but received no
+   * client offer, rounded up to the nearest multiple of 8.
+   * @since 2.7.0
+   */
+  Optional snowflakeIdleCount();
+
+  /**
+   * Return a count of the number of times a client has requested a proxy from
+   * the broker but no proxies were available, rounded up to the nearest
+   * multiple of 8.
+   *
+   * @return Count of the number of times a client has requested a proxy from
+   * the broker but no proxies were available, rounded up to the nearest
+   * multiple of 8.
+   * @since 2.7.0
+   */
+  Optional clientDeniedCount();
+
+  /**
+   * Return a count of the number of times a client successfully received a
+   * proxy from the broker, rounded up to the nearest multiple of 8.
+   *
+   * @return Count of the number of times a client successfully received a 
proxy
+   * from the broker, rounded up to the nearest multiple of 8.
+   * @since 2.7.0
+   */
+  Optional clientSnowflakeMatchCount();
+}
+
diff --git 
a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java 
b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
index ef9da56..9b620cb 100644
--- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
@@ -130,6 +130,11 @@ public class DescriptorParserImpl implements 
DescriptorParser {
 } else if (firstLines.startsWith("@type torperf 1.")) {
   return TorperfResultImpl.parseTorperfResults(rawDescriptorBytes,
   sourceFile);
+} else if (firstLines.startsWith("@type snowflake-stats 1.")
+|| firstLines.startsWith(Key.SNOWFLAKE_STATS_END.keyword + SP)
+|| firstLines.contains(NL + Key.SNOWFLAKE_STATS_END.keyword + SP)) {
+  return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile,
+  Key.SNOWF

[tor-commits] [newsletter/master] Update symlinks

[hiro]

commit ca381b25ffbcbe51c18e60ef70b63b851e0480fc
Author: hiro 
Date:   Thu Sep 5 16:47:52 2019 +0200

Update symlinks
---
 assets/javascript   | 2 +-
 assets/scss | 2 +-
 assets/static/css   | 2 +-
 assets/static/fonts | 2 +-
 assets/static/js| 2 +-
 lego| 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/javascript b/assets/javascript
index c8db05e..f1da3c5 12
--- a/assets/javascript
+++ b/assets/javascript
@@ -1 +1 @@
-../lego/assests/javascript
\ No newline at end of file
+../lego/assets/javascript
\ No newline at end of file
diff --git a/assets/scss b/assets/scss
index b77f409..2d8ed2e 12
--- a/assets/scss
+++ b/assets/scss
@@ -1 +1 @@
-../lego/assests/scss
\ No newline at end of file
+../lego/assets/scss
\ No newline at end of file
diff --git a/assets/static/css b/assets/static/css
index 0db4948..12e4567 12
--- a/assets/static/css
+++ b/assets/static/css
@@ -1 +1 @@
-../../lego/assests/static/css
\ No newline at end of file
+../../lego/assets/static/css
\ No newline at end of file
diff --git a/assets/static/fonts b/assets/static/fonts
index 2da38c7..25deee7 12
--- a/assets/static/fonts
+++ b/assets/static/fonts
@@ -1 +1 @@
-../../lego/assests/static/fonts
\ No newline at end of file
+../../lego/assets/static/fonts
\ No newline at end of file
diff --git a/assets/static/js b/assets/static/js
index 7b741e3..361859a 12
--- a/assets/static/js
+++ b/assets/static/js
@@ -1 +1 @@
-../../lego/assests/static/js
\ No newline at end of file
+../../lego/assets/static/js
\ No newline at end of file
diff --git a/lego b/lego
index aa31aec..3d80025 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17
+Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763

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

[tor-commits] [community/master] Update symlinks and add metatag

[hiro]

commit 24dc3300438f52ef9659860b956b796598b70555
Author: hiro 
Date:   Thu Sep 5 16:40:58 2019 +0200

Update symlinks and add metatag
---
 assets/javascript   | 2 +-
 assets/scss | 2 +-
 assets/static/css   | 2 +-
 assets/static/fonts | 2 +-
 assets/static/js| 2 +-
 lego| 2 +-
 templates/meta.html | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/assets/javascript b/assets/javascript
index c8db05e..f1da3c5 12
--- a/assets/javascript
+++ b/assets/javascript
@@ -1 +1 @@
-../lego/assests/javascript
\ No newline at end of file
+../lego/assets/javascript
\ No newline at end of file
diff --git a/assets/scss b/assets/scss
index b77f409..2d8ed2e 12
--- a/assets/scss
+++ b/assets/scss
@@ -1 +1 @@
-../lego/assests/scss
\ No newline at end of file
+../lego/assets/scss
\ No newline at end of file
diff --git a/assets/static/css b/assets/static/css
index 0db4948..12e4567 12
--- a/assets/static/css
+++ b/assets/static/css
@@ -1 +1 @@
-../../lego/assests/static/css
\ No newline at end of file
+../../lego/assets/static/css
\ No newline at end of file
diff --git a/assets/static/fonts b/assets/static/fonts
index 2da38c7..25deee7 12
--- a/assets/static/fonts
+++ b/assets/static/fonts
@@ -1 +1 @@
-../../lego/assests/static/fonts
\ No newline at end of file
+../../lego/assets/static/fonts
\ No newline at end of file
diff --git a/assets/static/js b/assets/static/js
index 7b741e3..361859a 12
--- a/assets/static/js
+++ b/assets/static/js
@@ -1 +1 @@
-../../lego/assests/static/js
\ No newline at end of file
+../../lego/assets/static/js
\ No newline at end of file
diff --git a/lego b/lego
index 4911d14..3d80025 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8
+Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763
diff --git a/templates/meta.html b/templates/meta.html
index a4ae472..bcda0da 100644
--- a/templates/meta.html
+++ b/templates/meta.html
@@ -1,5 +1,6 @@
 
 
+
 
 
 

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

[tor-commits] [tpo/master] Update symlinks and add metatag

[hiro]

commit c7c29ac05b9d7fd08b8203e76eb417688983217a
Author: hiro 
Date:   Thu Sep 5 16:38:28 2019 +0200

Update symlinks and add metatag
---
 assets/javascript   | 2 +-
 assets/scss | 2 +-
 assets/static/css   | 2 +-
 assets/static/fonts | 2 +-
 assets/static/js| 2 +-
 lego| 2 +-
 templates/meta.html | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/javascript b/assets/javascript
index c8db05e..f1da3c5 12
--- a/assets/javascript
+++ b/assets/javascript
@@ -1 +1 @@
-../lego/assests/javascript
\ No newline at end of file
+../lego/assets/javascript
\ No newline at end of file
diff --git a/assets/scss b/assets/scss
index b77f409..2d8ed2e 12
--- a/assets/scss
+++ b/assets/scss
@@ -1 +1 @@
-../lego/assests/scss
\ No newline at end of file
+../lego/assets/scss
\ No newline at end of file
diff --git a/assets/static/css b/assets/static/css
index 0db4948..12e4567 12
--- a/assets/static/css
+++ b/assets/static/css
@@ -1 +1 @@
-../../lego/assests/static/css
\ No newline at end of file
+../../lego/assets/static/css
\ No newline at end of file
diff --git a/assets/static/fonts b/assets/static/fonts
index 2da38c7..25deee7 12
--- a/assets/static/fonts
+++ b/assets/static/fonts
@@ -1 +1 @@
-../../lego/assests/static/fonts
\ No newline at end of file
+../../lego/assets/static/fonts
\ No newline at end of file
diff --git a/assets/static/js b/assets/static/js
index 7b741e3..361859a 12
--- a/assets/static/js
+++ b/assets/static/js
@@ -1 +1 @@
-../../lego/assests/static/js
\ No newline at end of file
+../../lego/assets/static/js
\ No newline at end of file
diff --git a/lego b/lego
index aa31aec..3d80025 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17
+Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763
diff --git a/templates/meta.html b/templates/meta.html
index 325d57a..8601988 100644
--- a/templates/meta.html
+++ b/templates/meta.html
@@ -2,7 +2,7 @@
 http://www.w3.org/1999/xhtml"; {% if bag('alternatives', this.alt, 
'direction') == 'text-right' %}dir="rtl"{% endif %}>
 
 
-
+
 
 
 

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

[tor-commits] [webwml/master] Redirect doc on how to verify signatures to new website

[hiro]

commit 58df633c88fc5ea05ac7756160fb815f060163c0
Author: hiro 
Date:   Thu Sep 5 16:21:06 2019 +0200

Redirect doc on how to verify signatures to new website
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index 570850bf..b049ced8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,6 +8,9 @@ RewriteRule ^documentation(.*) /docs/documentation$1 [R=301,L]
 RewriteRule ^verifying-signatures(.*) /docs/verifying-signatures$1 [R=301,L]
 RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
 
+# docs
+RewriteRule ^docs/verifying-signatures(.*) to 
​https://support.torproject.org/#how-to-verify-signature [R=302,L]
+
 # Torbutton
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]
 RewriteRule ^torbutton/(.*) /docs/torbutton/$1 [R=301,L]

___
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 'tor-github/pr/1295'

[asn]

commit 545c21e23dcb2c73ab9d9f33e2ea6906a230b4b5
Merge: ddd01541b 88839ab2a
Author: George Kadianakis 
Date:   Thu Sep 5 17:13:29 2019 +0300

Merge branch 'tor-github/pr/1295'

 src/lib/confmgt/structvar.c |  18 +++---
 src/lib/confmgt/typedvar.c  | 134 +++-
 src/lib/confmgt/typedvar.h  |  29 +++---
 3 files changed, 36 insertions(+), 145 deletions(-)

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

[tor-commits] [tor/master] typedvar: remove now-unused functions taking config_type_t.

[asn]

commit 161c392a4fbd85e2c67ae977cc6b46840a51151d
Author: Nick Mathewson 
Date:   Wed Sep 4 14:54:59 2019 -0400

typedvar: remove now-unused functions taking config_type_t.

These functions are no longer used.

Part of 31629.
---
 src/lib/confmgt/typedvar.c | 96 --
 src/lib/confmgt/typedvar.h | 13 ---
 2 files changed, 109 deletions(-)

diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c
index 3cba07539..1a1dcf73d 100644
--- a/src/lib/confmgt/typedvar.c
+++ b/src/lib/confmgt/typedvar.c
@@ -254,99 +254,3 @@ var_type_is_settable(const var_type_def_t *def)
 {
   return ! def->is_unsettable;
 }
-
-/* =
- * The functions below take a config_type_t instead of a var_type_def_t.
- * I'd like to deprecate them eventually and use var_type_def_t everywhere,
- * but for now they make migration easier.
- * = */
-
-/**
- * As typed_var_assign_ex(), but look up the definition of the configuration
- * type from a provided config_type_t enum.
- */
-int
-typed_var_assign(void *target, const char *value, char **errmsg,
- config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_assign_ex(target, value, errmsg, def);
-}
-
-/**
- * As typed_var_kvassign_ex(), but look up the definition of the configuration
- * type from a provided config_type_t enum.
- */
-int
-typed_var_kvassign(void *target, const config_line_t *line, char **errmsg,
-   config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_kvassign_ex(target, line, errmsg, def);
-}
-
-/**
- * As typed_var_free_ex(), but look up the definition of the configuration
- * type from a provided config_type_t enum.
- */
-void
-typed_var_free(void *target, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_free_ex(target, def);
-}
-
-/**
- * As typed_var_encode_ex(), but look up the definition of the configuration
- * type from a provided config_type_t enum.
- */
-char *
-typed_var_encode(const void *value, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_encode_ex(value, def);
-}
-
-/**
- * As typed_var_kvencode_ex(), but look up the definition of the configuration
- * type from a provided config_type_t enum.
- */
-config_line_t *
-typed_var_kvencode(const char *key, const void *value, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_kvencode_ex(key, value, def);
-}
-
-/**
- * As typed_var_copy_ex(), but look up the definition of the configuration type
- * from a provided config_type_t enum.
- */
-int
-typed_var_copy(void *dest, const void *src, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_copy_ex(dest, src, def);
-}
-
-/**
- * As typed_var_eq_ex(), but look up the definition of the configuration type
- * from a provided config_type_t enum.
- */
-bool
-typed_var_eq(const void *a, const void *b, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_eq_ex(a, b, def);
-}
-
-/**
- * As typed_var_ok_ex(), but look up the definition of the configuration type
- * from a provided config_type_t enum.
- */
-bool
-typed_var_ok(const void *value, config_type_t type)
-{
-  const var_type_def_t *def = lookup_type_def(type);
-  return typed_var_ok_ex(value, def);
-}
diff --git a/src/lib/confmgt/typedvar.h b/src/lib/confmgt/typedvar.h
index 2e36f9d67..e1ede6f95 100644
--- a/src/lib/confmgt/typedvar.h
+++ b/src/lib/confmgt/typedvar.h
@@ -20,19 +20,6 @@ struct config_line_t;
 typedef struct var_type_fns_t var_type_fns_t;
 typedef struct var_type_def_t var_type_def_t;
 
-int typed_var_assign(void *target, const char *value, char **errmsg,
- enum config_type_t type);
-void typed_var_free(void *target, enum config_type_t type);
-char *typed_var_encode(const void *value, enum config_type_t type);
-int typed_var_copy(void *dest, const void *src, enum config_type_t type);
-bool typed_var_eq(const void *a, const void *b, enum config_type_t type);
-bool typed_var_ok(const void *value, enum config_type_t type);
-
-int typed_var_kvassign(void *target, const struct config_line_t *line,
-   char **errmsg, enum config_type_t type);
-struct config_line_t *typed_var_kvencode(const char *key, const void *value,
- enum config_type_t type);
-
 int typed_var_assign_ex(void *target, const char *value, char **errmsg,
 const var_type_def_t *def);
 void typed_var_free_ex(void *target, const var_type_def_t *def);



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

[tor-commits] [tor/master] Remove _ex suffix from typed_var_*_ex() functions.

[asn]

commit 88839ab2ac489af7b80c2812fc87ab8b89075fbb
Author: Nick Mathewson 
Date:   Wed Sep 4 14:58:56 2019 -0400

Remove _ex suffix from typed_var_*_ex() functions.

Now that the variants of these functions that took config_line_t are
gone, there is no longer any reason for the remaining variants to
have "ex" at the end of their names.

This commit was made by running this perl script over all the files
in src/:

#!/usr/bin/perl -w -i -p


s{typed_var_(assign|free|encode|copy|eq|ok|kvassign|kvencode|mark_fragile)_ex}
 {typed_var_$1}g;
---
 src/lib/confmgt/structvar.c | 18 +-
 src/lib/confmgt/typedvar.c  | 38 +++---
 src/lib/confmgt/typedvar.h  | 18 +-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index 97a8fb363..32f616c21 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -103,7 +103,7 @@ struct_var_assign(void *object, const char *value, char 
**errmsg,
   void *p = struct_get_mptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_assign_ex(p, value, errmsg, def);
+  return typed_var_assign(p, value, errmsg, def);
 }
 
 /**
@@ -116,7 +116,7 @@ struct_var_free(void *object, const struct_member_t *member)
   void *p = struct_get_mptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  typed_var_free_ex(p, def);
+  typed_var_free(p, def);
 }
 
 /**
@@ -129,7 +129,7 @@ struct_var_encode(const void *object, const struct_member_t 
*member)
   const void *p = struct_get_ptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_encode_ex(p, def);
+  return typed_var_encode(p, def);
 }
 
 /**
@@ -143,7 +143,7 @@ struct_var_copy(void *dest, const void *src, const 
struct_member_t *member)
   const void *p_src = struct_get_ptr(src, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_copy_ex(p_dest, p_src, def);
+  return typed_var_copy(p_dest, p_src, def);
 }
 
 /**
@@ -157,7 +157,7 @@ struct_var_eq(const void *a, const void *b, const 
struct_member_t *member)
   const void *p_b = struct_get_ptr(b, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_eq_ex(p_a, p_b, def);
+  return typed_var_eq(p_a, p_b, def);
 }
 
 /**
@@ -170,7 +170,7 @@ struct_var_ok(const void *object, const struct_member_t 
*member)
   const void *p = struct_get_ptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_ok_ex(p, def);
+  return typed_var_ok(p, def);
 }
 
 /**
@@ -185,7 +185,7 @@ struct_var_kvassign(void *object, const struct 
config_line_t *line,
   void *p = struct_get_mptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_kvassign_ex(p, line, errmsg, def);
+  return typed_var_kvassign(p, line, errmsg, def);
 }
 
 /**
@@ -198,7 +198,7 @@ struct_var_kvencode(const void *object, const 
struct_member_t *member)
   const void *p = struct_get_ptr(object, member);
   const var_type_def_t *def = get_type_def(member);
 
-  return typed_var_kvencode_ex(member->name, p, def);
+  return typed_var_kvencode(member->name, p, def);
 }
 
 /**
@@ -211,7 +211,7 @@ struct_var_mark_fragile(void *object, const struct_member_t 
*member)
 {
   void *p = struct_get_mptr(object, member);
   const var_type_def_t *def = get_type_def(member);
-  return typed_var_mark_fragile_ex(p, def);
+  return typed_var_mark_fragile(p, def);
 }
 
 /**
diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c
index 1a1dcf73d..43040e1e0 100644
--- a/src/lib/confmgt/typedvar.c
+++ b/src/lib/confmgt/typedvar.c
@@ -40,13 +40,13 @@
  * string holding an error message, and return -1.
  **/
 int
-typed_var_assign_ex(void *target, const char *value, char **errmsg,
+typed_var_assign(void *target, const char *value, char **errmsg,
 const var_type_def_t *def)
 {
   if (BUG(!def))
 return -1; // LCOV_EXCL_LINE
   // clear old value if needed.
-  typed_var_free_ex(target, def);
+  typed_var_free(target, def);
 
   tor_assert(def->fns->parse);
   return def->fns->parse(target, value, errmsg, def->params);
@@ -55,7 +55,7 @@ typed_var_assign_ex(void *target, const char *value, char 
**errmsg,
 /**
  * Try to parse a single line from the head ofline that encodes an
  * object of the type defined in def. On success and failure, behave as
- * typed_var_assign_ex().
+ * typed_var_assign().
  *
  * All types for which keys are significant should use this function.
  *
@@ -63,7 +63,7 @@ typed_var_assign_ex(void *target, const char *value, char 
**errmsg,
  * only the first one is handled by this function.
  **/
 int
-typed_var_kvassign_ex(void *target, const config_line_t *line,
+typed_var_kvassign(void *target, const config_line_t *line,
   char **errmsg, const var_type_def_t *def

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1294'

[asn]

commit ddd01541b909a84396e2d9ba31266ae63670c938
Merge: fb56b4c2b eb909c4e4
Author: George Kadianakis 
Date:   Thu Sep 5 17:12:19 2019 +0300

Merge branch 'tor-github/pr/1294'

 src/app/config/confparse.c |  9 ++
 src/app/config/confparse.h | 69 +-
 src/lib/conf/conftypes.h   |  4 +++
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --cc src/lib/conf/conftypes.h
index 612272e45,3db115204..4609564b3
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@@ -122,9 -100,13 +122,13 @@@ typedef struct struct_member_t 
   * that they have the correct type.
   */
  typedef struct struct_magic_decl_t {
+   /** The name of the structure */
const char *typename;
+   /** A value used to recognize instances of this structure. */
uint32_t magic_val;
+   /** The location within the structure at which we expect to find
+* magic_val. */
 -  int magic_offset;
 +  ptrdiff_t magic_offset;
  } struct_magic_decl_t;
  
  /**

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

[tor-commits] [tor/master] Document warn_deprecated_option().

[asn]

commit 3db56aeeb8a59629690a05cd43565764a254d1e1
Author: Nick Mathewson 
Date:   Wed Sep 4 14:01:43 2019 -0400

Document warn_deprecated_option().
---
 src/app/config/confparse.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 23a89ba62..b0ff4daa8 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -578,6 +578,10 @@ config_mark_lists_fragile(const config_mgr_t *mgr, void 
*options)
   } SMARTLIST_FOREACH_END(mv);
 }
 
+/**
+ * Log a warning that declaring that the option called what
+ * is deprecated because of the reason in why.
+ **/
 void
 warn_deprecated_option(const char *what, const char *why)
 {



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

[tor-commits] [tor/master] Document validate_fn_t as it stands.

[asn]

commit 39dd2e2aa826930bfe681d99c3e8374757ac511b
Author: Nick Mathewson 
Date:   Wed Sep 4 13:54:26 2019 -0400

Document validate_fn_t as it stands.

Also document that it will be changed in a later branch.
---
 src/app/config/confparse.h | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index 405200d69..baf60f07c 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -51,10 +51,28 @@ typedef struct config_deprecation_t {
  **/
 #define PLURAL(tok) { #tok, #tok "s", 0, 0 }
 
-/** Type of a callback to validate whether a given configuration is
- * well-formed and consistent. See options_trial_assign() for documentation
- * of arguments. */
-typedef int (*validate_fn_t)(void*,void*,void*,int,char**);
+/**
+ * Type of a callback to validate whether a given configuration is
+ * well-formed and consistent.
+ *
+ * The configuration to validate is passed as newval. The previous
+ * configuration, if any, is provided in oldval.  The
+ * default_val argument receives a configuration object initialized
+ * with default values for all its fields.  The from_setconf argument
+ * is true iff the input comes from a SETCONF controller command.
+ *
+ * On success, return 0.  On failure, set *msg_out to a newly allocated
+ * error message, and return -1.
+ *
+ * REFACTORING NOTE: Currently, this callback type is only used from inside
+ * config_dump(); later in our refactoring, it will be cleaned up and used
+ * more generally.
+ */
+typedef int (*validate_fn_t)(void *oldval,
+ void *newval,
+ void *default_val,
+ int from_setconf,
+ char **msg_out);
 
 struct config_mgr_t;
 



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

[tor-commits] [tor/master] Document fields of struct_magic_decl_t.

[asn]

commit b3c28677159c26070f26909b3f4c2e00e50d7bff
Author: Nick Mathewson 
Date:   Wed Sep 4 14:03:38 2019 -0400

Document fields of struct_magic_decl_t.
---
 src/lib/conf/conftypes.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index fabad97d0..3db115204 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -100,8 +100,12 @@ typedef struct struct_member_t {
  * that they have the correct type.
  */
 typedef struct struct_magic_decl_t {
+  /** The name of the structure */
   const char *typename;
+  /** A value used to recognize instances of this structure. */
   uint32_t magic_val;
+  /** The location within the structure at which we expect to find
+   * magic_val. */
   int magic_offset;
 } struct_magic_decl_t;
 



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

[tor-commits] [tor/master] config: note that some arguments are required.

[asn]

commit eb909c4e433087b466e78d33af8eed47adcabf16
Author: Nick Mathewson 
Date:   Thu Sep 5 07:57:36 2019 -0400

config: note that some arguments are required.
---
 src/app/config/confparse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index b0ff4daa8..054d2addb 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -581,6 +581,8 @@ config_mark_lists_fragile(const config_mgr_t *mgr, void 
*options)
 /**
  * Log a warning that declaring that the option called what
  * is deprecated because of the reason in why.
+ *
+ * (Both arguments must be non-NULL.)
  **/
 void
 warn_deprecated_option(const char *what, const char *why)



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

[tor-commits] [tor/master] Document configuration and abbreviation types.

[asn]

commit 577ea20b3a34ed61bc7a005e4105c63abad85d41
Author: Nick Mathewson 
Date:   Wed Sep 4 13:41:53 2019 -0400

Document configuration and abbreviation types.
---
 src/app/config/confparse.h | 23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index b788e2cd1..d628db503 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -17,21 +17,38 @@
 #include "lib/conf/confmacros.h"
 #include "lib/testsupport/testsupport.h"
 
-/** An abbreviation for a configuration option allowed on the command line. */
+/**
+ * An abbreviation or alias for a configuration option.
+ **/
 typedef struct config_abbrev_t {
+  /** The option name as abbreviated.  Not case-sensitive. */
   const char *abbreviated;
+  /** The full name of the option. Not case-sensitive. */
   const char *full;
+  /** True if this abbreviation should only be allowed on the command line. */
   int commandline_only;
+  /** True if we should warn whenever this abbreviation is used. */
   int warn;
 } config_abbrev_t;
 
+/**
+ * A note that a configuration option is deprecated, with an explanation why.
+ */
 typedef struct config_deprecation_t {
+  /** The option that is deprecated. */
   const char *name;
+  /** A user-facing string explaining why the option is deprecated. */
   const char *why_deprecated;
 } config_deprecation_t;
 
-/* Handy macro for declaring "In the config file or on the command line,
- * you can abbreviate toks as tok". */
+/**
+ * Handy macro for declaring "In the config file or on the command line, you
+ * can abbreviate toks as tok". Used inside an array of
+ * config_abbrev_t.
+ *
+ * For example, to declare "NumCpu" as an abbreviation for "NumCPUs",
+ * you can say PLURAL(NumCpu).
+ **/
 #define PLURAL(tok) { #tok, #tok "s", 0, 0 }
 
 /** Type of a callback to validate whether a given configuration is



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

[tor-commits] [tor/master] config_assign: Document CAL_* options.

[asn]

commit aeda598fd5935331e96975b91eb91bce21096f9b
Author: Nick Mathewson 
Date:   Wed Sep 4 13:48:16 2019 -0400

config_assign: Document CAL_* options.

These were sort of described in config_assign() documentation, but
not so well.
---
 src/app/config/confparse.h | 20 
 1 file changed, 20 insertions(+)

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index d628db503..405200d69 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -113,8 +113,28 @@ struct smartlist_t *config_mgr_list_deprecated_vars(const 
config_mgr_t *mgr);
 /** A collection of managed configuration objects. */
 typedef struct config_suite_t config_suite_t;
 
+/**
+ * Flag for config_assign: if set, then "resetting" an option changes it to
+ * its default value, as specified in the config_var_t.  Otherwise,
+ * "resetting" an option changes it to a type-dependent null value --
+ * typically 0 or NULL.
+ *
+ * (An option is "reset" when it is set to an empty value, or as described in
+ * CAL_CLEAR_FIRST).
+ **/
 #define CAL_USE_DEFAULTS  (1u<<0)
+/**
+ * Flag for config_assign: if set, then we reset every provided config
+ * option before we set it.
+ *
+ * For example, if this flag is not set, then passing a multi-line option to
+ * config_assign will cause any previous value to be extended. But if this
+ * flag is set, then a multi-line option will replace any previous value.
+ **/
 #define CAL_CLEAR_FIRST   (1u<<1)
+/**
+ * Flag for config_assign: if set, we warn about deprecated options.
+ **/
 #define CAL_WARN_DEPRECATIONS (1u<<2)
 
 void *config_new(const config_mgr_t *fmt);



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

[tor-commits] [tor/master] Document return value of config_mgr_add_format().

[asn]

commit 39316da9b643583f52c1ff30bca7a07ea04cdba3
Author: Nick Mathewson 
Date:   Wed Sep 4 14:01:32 2019 -0400

Document return value of config_mgr_add_format().
---
 src/app/config/confparse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index f20a361ba..23a89ba62 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -203,6 +203,9 @@ config_mgr_register_fmt(config_mgr_t *mgr,
 /**
  * Add a new format to this configuration object.  Asserts on failure.
  *
+ * Returns an internal "index" value used to identify this format within
+ * all of those formats contained in mgr.  This index value
+ * should not generally be used outside of this module.
  **/
 int
 config_mgr_add_format(config_mgr_t *mgr,



___
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 'tor-github/pr/1293'

[asn]

commit fb56b4c2bffe5d1d752694901b1853d89e3fb8cc
Merge: c750ec20a 03ce67d37
Author: George Kadianakis 
Date:   Thu Sep 5 17:10:07 2019 +0300

Merge branch 'tor-github/pr/1293'

 src/lib/conf/conftypes.h | 32 ++--
 1 file changed, 26 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/master] config: explain CONFIG_TYPE_EXTENDED

[asn]

commit 03ce67d37840f260f478009caa04aad1aa9b60c0
Author: Nick Mathewson 
Date:   Wed Sep 4 11:54:42 2019 -0400

config: explain CONFIG_TYPE_EXTENDED

Also add an explanation of a possible future refactoring where we
might remove the config_type_t enumeration entierly.

Fixes ticket 31624.

No changes file, since this is a comment-only change.
---
 src/lib/conf/conftypes.h | 32 ++--
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index fabad97d0..15662ba00 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -63,8 +63,17 @@ typedef enum config_type_t {
  * context-sensitive config lines when fetching.
  */
   CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
-  CONFIG_TYPE_EXTENDED, /**< Extended type; definition will appear in
- * pointer. */
+  /**
+   * Extended type: definition appears in the type_def pointer
+   * of the corresponding struct_member_t.
+   *
+   * For some types, we cannot define them as particular values of this
+   * enumeration, since those types are abstractions defined at a higher level
+   * than this module.  (For example, parsing a routerset_t is higher-level
+   * than this module.)  To handle this, we use CONFIG_TYPE_EXTENDED for those
+   * types, and give a definition for them in the struct_member_t.type_def.
+   **/
+  CONFIG_TYPE_EXTENDED,
 } config_type_t;
 
 /* Forward delcaration for var_type_def_t, for extended types. */
@@ -74,15 +83,26 @@ struct var_type_def_t;
 typedef struct struct_member_t {
   /** Name of the field. */
   const char *name;
-  /** Type of the field, according to the config_type_t enumeration.
+  /**
+   * Type of the field, according to the config_type_t enumeration.
*
-   * This value is CONFIG_TYPE_EXTENDED for any type not listed in
-   * config_type_t.
+   * For any type not otherwise listed in config_type_t, this field's value
+   * should be CONFIG_TYPE_EXTENDED.  When it is, the type_def pointer
+   * must be set.
**/
+  /*
+   * NOTE: In future refactoring, we might remove this field entirely, along
+   * with its corresponding enumeration.  In that case, we will require that
+   * type_def be set in all cases. If we do, we will also need a new mechanism
+   * to enforce consistency between configuration variable types and their
+   * corresponding structures, since our current design in
+   * lib/conf/conftesting.h won't work any more.
+   */
   config_type_t type;
   /**
* Pointer to a type definition for the type of this field. Overrides
-   * type if not NULL.
+   * type if it is not NULL.  Must be set when type is
+   * CONFIG_TYPE_EXTENDED.
**/
   const struct var_type_def_t *type_def;
   /**



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

[tor-commits] [tor/master] buffers: use ptrdiff_t to indicate offsets.

[asn]

commit 3aba13f77927e669d80009b2318c6d3d3d90a922
Author: Nick Mathewson 
Date:   Wed Sep 4 11:06:15 2019 -0400

buffers: use ptrdiff_t to indicate offsets.

Previously we used int in some places and off_t for others.  Neither
is correct: ptrdiff_t is right for differences between pointers.
(off_t is only for offsets and sizes on the filesystem.)
---
 src/lib/buf/buffers.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c
index 88a25b847..4d026bd37 100644
--- a/src/lib/buf/buffers.c
+++ b/src/lib/buf/buffers.c
@@ -158,7 +158,7 @@ chunk_new_with_alloc_size(size_t alloc)
 static inline chunk_t *
 chunk_grow(chunk_t *chunk, size_t sz)
 {
-  off_t offset;
+  ptrdiff_t offset;
   const size_t memlen_orig = chunk->memlen;
   const size_t orig_alloc = CHUNK_ALLOC_SIZE(memlen_orig);
   const size_t new_alloc = CHUNK_ALLOC_SIZE(sz);
@@ -440,7 +440,7 @@ chunk_copy(const chunk_t *in_chunk)
 #endif
   newch->next = NULL;
   if (in_chunk->data) {
-off_t offset = in_chunk->data - in_chunk->mem;
+ptrdiff_t offset = in_chunk->data - in_chunk->mem;
 newch->data = newch->mem + offset;
   }
   return newch;
@@ -710,7 +710,8 @@ buf_move_all(buf_t *buf_out, buf_t *buf_in)
 /** Internal structure: represents a position in a buffer. */
 typedef struct buf_pos_t {
   const chunk_t *chunk; /**< Which chunk are we pointing to? */
-  int pos;/**< Which character inside the chunk's data are we pointing to? */
+  ptrdiff_t pos;/**< Which character inside the chunk's data are we pointing
+ * to? */
   size_t chunk_pos; /**< Total length of all previous chunks. */
 } buf_pos_t;
 
@@ -726,15 +727,15 @@ buf_pos_init(const buf_t *buf, buf_pos_t *out)
 /** Advance out to the first appearance of ch at the current
  * position of out, or later.  Return -1 if no instances are found;
  * otherwise returns the absolute position of the character. */
-static off_t
+static ptrdiff_t
 buf_find_pos_of_char(char ch, buf_pos_t *out)
 {
   const chunk_t *chunk;
-  int pos;
+  ptrdiff_t pos;
   tor_assert(out);
   if (out->chunk) {
 if (out->chunk->datalen) {
-  tor_assert(out->pos < (off_t)out->chunk->datalen);
+  tor_assert(out->pos < (ptrdiff_t)out->chunk->datalen);
 } else {
   tor_assert(out->pos == 0);
 }
@@ -762,7 +763,7 @@ buf_pos_inc(buf_pos_t *pos)
 {
   tor_assert(pos->pos < INT_MAX - 1);
   ++pos->pos;
-  if (pos->pos == (off_t)pos->chunk->datalen) {
+  if (pos->pos == (ptrdiff_t)pos->chunk->datalen) {
 if (!pos->chunk->next)
   return -1;
 pos->chunk_pos += pos->chunk->datalen;
@@ -836,11 +837,11 @@ buf_peek_startswith(const buf_t *buf, const char *cmd)
 
 /** Return the index within buf at which ch first appears,
  * or -1 if ch does not appear on buf. */
-static off_t
+static ptrdiff_t
 buf_find_offset_of_char(buf_t *buf, char ch)
 {
   chunk_t *chunk;
-  off_t offset = 0;
+  ptrdiff_t offset = 0;
   tor_assert(buf->datalen < INT_MAX);
   for (chunk = buf->head; chunk; chunk = chunk->next) {
 char *cp = memchr(chunk->data, ch, chunk->datalen);
@@ -863,7 +864,7 @@ int
 buf_get_line(buf_t *buf, char *data_out, size_t *data_len)
 {
   size_t sz;
-  off_t offset;
+  ptrdiff_t offset;
 
   if (!buf->head)
 return 0;



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

[tor-commits] [tor/master] smartlist_pqueue: use ptrdiff_t instead of int for offsets.

[asn]

commit dc199f40fb03588af0bccb149a564e895e11d60d
Author: Nick Mathewson 
Date:   Wed Sep 4 10:56:14 2019 -0400

smartlist_pqueue: use ptrdiff_t instead of int for offsets.

This is technically correct, but should not matter in practice,
since we don't use this on any structs whose size exceeds INT_MAX.
---
 src/lib/container/smartlist.c | 10 +-
 src/lib/container/smartlist.h |  9 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c
index 3ab2797d6..2b71c1128 100644
--- a/src/lib/container/smartlist.c
+++ b/src/lib/container/smartlist.c
@@ -678,7 +678,7 @@ smartlist_sort_pointers(smartlist_t *sl)
 static inline void
 smartlist_heapify(smartlist_t *sl,
   int (*compare)(const void *a, const void *b),
-  int idx_field_offset,
+  ptrdiff_t idx_field_offset,
   int idx)
 {
   while (1) {
@@ -725,7 +725,7 @@ smartlist_heapify(smartlist_t *sl,
 void
 smartlist_pqueue_add(smartlist_t *sl,
  int (*compare)(const void *a, const void *b),
- int idx_field_offset,
+ ptrdiff_t idx_field_offset,
  void *item)
 {
   int idx;
@@ -754,7 +754,7 @@ smartlist_pqueue_add(smartlist_t *sl,
 void *
 smartlist_pqueue_pop(smartlist_t *sl,
  int (*compare)(const void *a, const void *b),
- int idx_field_offset)
+ ptrdiff_t idx_field_offset)
 {
   void *top;
   tor_assert(sl->num_used);
@@ -778,7 +778,7 @@ smartlist_pqueue_pop(smartlist_t *sl,
 void
 smartlist_pqueue_remove(smartlist_t *sl,
 int (*compare)(const void *a, const void *b),
-int idx_field_offset,
+ptrdiff_t idx_field_offset,
 void *item)
 {
   int idx = IDX_OF_ITEM(item);
@@ -802,7 +802,7 @@ smartlist_pqueue_remove(smartlist_t *sl,
 void
 smartlist_pqueue_assert_ok(smartlist_t *sl,
int (*compare)(const void *a, const void *b),
-   int idx_field_offset)
+   ptrdiff_t idx_field_offset)
 {
   int i;
   for (i = sl->num_used - 1; i >= 0; --i) {
diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h
index 81b015143..25638e4b2 100644
--- a/src/lib/container/smartlist.h
+++ b/src/lib/container/smartlist.h
@@ -13,6 +13,7 @@
  **/
 
 #include 
+#include 
 
 #include "lib/smartlist_core/smartlist_core.h"
 #include "lib/smartlist_core/smartlist_foreach.h"
@@ -72,18 +73,18 @@ int smartlist_bsearch_idx(const smartlist_t *sl, const void 
*key,
 
 void smartlist_pqueue_add(smartlist_t *sl,
   int (*compare)(const void *a, const void *b),
-  int idx_field_offset,
+  ptrdiff_t idx_field_offset,
   void *item);
 void *smartlist_pqueue_pop(smartlist_t *sl,
int (*compare)(const void *a, const void *b),
-   int idx_field_offset);
+   ptrdiff_t idx_field_offset);
 void smartlist_pqueue_remove(smartlist_t *sl,
  int (*compare)(const void *a, const void *b),
- int idx_field_offset,
+ ptrdiff_t idx_field_offset,
  void *item);
 void smartlist_pqueue_assert_ok(smartlist_t *sl,
 int (*compare)(const void *a, const void *b),
-int idx_field_offset);
+ptrdiff_t idx_field_offset);
 
 char *smartlist_join_strings(smartlist_t *sl, const char *join, int terminate,
  size_t *len_out) ATTR_MALLOC;



___
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 'tor-github/pr/1291'

[asn]

commit c750ec20ab3f24fad09695317da55888788e772e
Merge: c29f05b15 106b75aa5
Author: George Kadianakis 
Date:   Thu Sep 5 17:09:20 2019 +0300

Merge branch 'tor-github/pr/1291'

 changes/ticket31532   |  4 
 src/app/config/confparse.h|  2 +-
 src/feature/rend/rendclient.c |  2 +-
 src/lib/buf/buffers.c | 21 +++--
 src/lib/cc/compat_compiler.h  |  2 +-
 src/lib/conf/conftypes.h  |  6 --
 src/lib/container/smartlist.c | 10 +-
 src/lib/container/smartlist.h |  9 +
 8 files changed, 32 insertions(+), 24 deletions(-)

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

[tor-commits] [tor/master] config: use ptrdiff_t for all field-offset members.

[asn]

commit 539158f2be6001a7849b7a85e053e43d7d78195a
Author: Nick Mathewson 
Date:   Wed Sep 4 10:50:09 2019 -0400

config: use ptrdiff_t for all field-offset members.

Previously we used int here, but it is more correct to use
ptrdiff_t.  (This never actually matters for our code in practice,
since the structure we are managing here never exceed INT_MAX in
size.)
---
 src/app/config/confparse.h | 2 +-
 src/lib/conf/conftypes.h   | 6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index b788e2cd1..fc07996aa 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -72,7 +72,7 @@ typedef struct config_format_t {
   const struct_member_t *extra;
   /** The position of a config_suite_t pointer within the toplevel object,
* or -1 if there is no such pointer. */
-  int config_suite_offset;
+  ptrdiff_t config_suite_offset;
 } config_format_t;
 
 /**
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index fabad97d0..abfb53b21 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -33,6 +33,8 @@
 #include "lib/conf/conftesting.h"
 #endif
 
+#include 
+
 /** Enumeration of types which option values can take */
 typedef enum config_type_t {
   CONFIG_TYPE_STRING = 0,   /**< An arbitrary string. */
@@ -89,7 +91,7 @@ typedef struct struct_member_t {
* Offset of this field within the structure.  Compute this with
* offsetof(structure, fieldname).
**/
-  int offset;
+  ptrdiff_t offset;
 } struct_member_t;
 
 /**
@@ -102,7 +104,7 @@ typedef struct struct_member_t {
 typedef struct struct_magic_decl_t {
   const char *typename;
   uint32_t magic_val;
-  int magic_offset;
+  ptrdiff_t magic_offset;
 } struct_magic_decl_t;
 
 /**



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

[tor-commits] [tor/master] changes file for 31532

[asn]

commit 106b75aa5398f7a260a4d0f3093c244376258242
Author: Nick Mathewson 
Date:   Wed Sep 4 11:09:01 2019 -0400

changes file for 31532
---
 changes/ticket31532 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket31532 b/changes/ticket31532
new file mode 100644
index 0..95bcbc517
--- /dev/null
+++ b/changes/ticket31532
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Use the ptrdiff_t type consistently for expressing variable offsets and
+  pointer differences.  Previously we incorrectly (but harmlessly) used
+  int and sometimes off_t for these cases.  Closes ticket 31532.



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

[tor-commits] [tor/master] compat_compiler: fix documentation for STRUCT_VAR_P

[asn]

commit b39ee42904d9210ff3b6872d69535d32f588f907
Author: Nick Mathewson 
Date:   Wed Sep 4 10:56:57 2019 -0400

compat_compiler: fix documentation for STRUCT_VAR_P

Previously we had said that off_t was a reasonable type to hold the
result of offsetof().  That isn't so: ptrdiff_t is correct.
---
 src/lib/cc/compat_compiler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h
index a8d159321..92301449e 100644
--- a/src/lib/cc/compat_compiler.h
+++ b/src/lib/cc/compat_compiler.h
@@ -195,7 +195,7 @@
  * structure st.  Example:
  * 
  *   struct a { int foo; int bar; } x;
- *   off_t bar_offset = offsetof(struct a, bar);
+ *   ptrdiff_t bar_offset = offsetof(struct a, bar);
  *   int *bar_p = STRUCT_VAR_P(&x, bar_offset);
  *   *bar_p = 3;
  * 



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

[tor-commits] [tor/master] rendclient: use ptrdiff, not off_t, for offset of DH field.

[asn]

commit ec724fe8c8baf245a4cada85bb8b8b4832f6e725
Author: Nick Mathewson 
Date:   Wed Sep 4 10:59:18 2019 -0400

rendclient: use ptrdiff, not off_t, for offset of DH field.

The off_t type is only useful for offsets on the filesystem.  For
in-memory offsets, use ptrdiff_t.
---
 src/feature/rend/rendclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5bdd4d453..2540066df 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -119,7 +119,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
   char tmp[RELAY_PAYLOAD_SIZE];
   rend_cache_entry_t *entry = NULL;
   crypt_path_t *cpath;
-  off_t dh_offset;
+  ptrdiff_t dh_offset;
   crypto_pk_t *intro_key = NULL;
   int status = 0;
   const char *onion_address;



___
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 'tor-github/pr/1292'

[asn]

commit c29f05b159ae51472cd2a183a36cb9d352c082e5
Merge: cdd7e8897 870874fec
Author: George Kadianakis 
Date:   Thu Sep 5 17:06:58 2019 +0300

Merge branch 'tor-github/pr/1292'

 changes/ticket31529|  5 +
 src/app/config/confparse.c | 11 ---
 2 files changed, 13 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] config: Make CLEAR with a nonempty value into a nonfatal assertion.

[asn]

commit 870874fec8cadf3a3e91f63cd7f25757b1ec8b8a
Author: Nick Mathewson 
Date:   Wed Sep 4 11:28:21 2019 -0400

config: Make CLEAR with a nonempty value into a nonfatal assertion.

When we parse a CLEAR line (e.g., "/OrPort" or /OrPort blah blah"),
we always suppress the value, even if one exists.  That means that
the block of code was meant to handle CLEAR lines didn't actually do
anything, since we previously handled them the same way as with
other empty values.

Closes ticket 31529.
---
 changes/ticket31529|  5 +
 src/app/config/confparse.c | 11 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/changes/ticket31529 b/changes/ticket31529
new file mode 100644
index 0..84f982214
--- /dev/null
+++ b/changes/ticket31529
@@ -0,0 +1,5 @@
+  o Minor features (debugging):
+- Log a nonfatal assertion failure if we encounter a configuration
+  line whose command is "CLEAR" but which has a nonempty value.
+  This should be impossible, according to the rules of our
+  configuration line parsing. Closes ticket 31529.
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index f20a361ba..ecc4e8656 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -652,9 +652,14 @@ config_assign_line(const config_mgr_t *mgr, void *options,
 }
 return 0;
   } else if (c->command == CONFIG_LINE_CLEAR && !clear_first) {
-//  This is unreachable, since a CLEAR line always has an
-//  empty value.
-config_reset(mgr, options, mvar, use_defaults); // LCOV_EXCL_LINE
+// This block is unreachable, since a CLEAR line always has an
+// empty value, and so will trigger be handled by the previous
+// "if (!strlen(c->value))" block.
+
+// LCOV_EXCL_START
+tor_assert_nonfatal_unreached();
+config_reset(mgr, options, mvar, use_defaults);
+// LCOV_EXCL_STOP
   }
 
   if (options_seen && ! config_var_is_cumulative(cvar)) {



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

[tor-commits] [tor/master] Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()

[asn]

commit be4a60945d724ca964d9d53f57cad6190a500077
Author: Neel Chauhan 
Date:   Sun Aug 25 20:22:57 2019 -0400

Check IPv6 exit policies on microdescriptors in 
node_exit_policy_rejects_all()
---
 changes/bug27284   |  5 +
 src/feature/dirparse/microdesc_parse.c | 11 +++
 src/feature/nodelist/microdesc_st.h|  2 ++
 src/feature/nodelist/nodelist.c|  3 +--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/changes/bug27284 b/changes/bug27284
new file mode 100644
index 0..14fc2082f
--- /dev/null
+++ b/changes/bug27284
@@ -0,0 +1,5 @@
+  o Minor bugfixes (ipv6):
+- When parsing microdescriptors, we should check the IPv6 exit policy
+  alongside IPv4. Previously, we checked both exit policies for only
+  router info structures, while microdescriptors were IPv4-only. Fixes
+  bug 27284; bugfix on 0.2.3.1-alpha. Patch by Neel Chauhan.
diff --git a/src/feature/dirparse/microdesc_parse.c 
b/src/feature/dirparse/microdesc_parse.c
index 22cc1e272..e02dfcf11 100644
--- a/src/feature/dirparse/microdesc_parse.c
+++ b/src/feature/dirparse/microdesc_parse.c
@@ -92,6 +92,12 @@ find_start_of_next_microdesc(const char *s, const char *eos)
 #undef NEXT_LINE
 }
 
+static inline int
+policy_is_reject_star_or_null(struct short_policy_t *policy)
+{
+  return !policy || short_policy_is_reject_star(policy);
+}
+
 /** Parse as many microdescriptors as are found from the string starting at
  * s and ending at eos.  If allow_annotations is set, read any
  * annotations we recognize and ignore ones we don't.
@@ -250,6 +256,11 @@ microdescs_parse_from_string(const char *s, const char 
*eos,
   md->ipv6_exit_policy = parse_short_policy(tok->args[0]);
 }
 
+if (policy_is_reject_star_or_null(md->exit_policy) &&
+policy_is_reject_star_or_null(md->ipv6_exit_policy)) {
+  md->policy_is_reject_star = 1;
+}
+
 smartlist_add(result, md);
 okay = 1;
 
diff --git a/src/feature/nodelist/microdesc_st.h 
b/src/feature/nodelist/microdesc_st.h
index c8265cb77..e017c46c7 100644
--- a/src/feature/nodelist/microdesc_st.h
+++ b/src/feature/nodelist/microdesc_st.h
@@ -33,6 +33,8 @@ struct microdesc_t {
   unsigned int no_save : 1;
   /** If true, this microdesc has an entry in the microdesc_map */
   unsigned int held_in_map : 1;
+  /** True iff the exit policy for this router rejects everything. */
+  unsigned int policy_is_reject_star : 1;
   /** Reference count: how many node_ts have a reference to this microdesc? */
   unsigned int held_by_nodes;
 
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index 21914c6c6..6ae8d2bcb 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -1424,8 +1424,7 @@ node_exit_policy_rejects_all(const node_t *node)
   if (node->ri)
 return node->ri->policy_is_reject_star;
   else if (node->md)
-return node->md->exit_policy == NULL ||
-  short_policy_is_reject_star(node->md->exit_policy);
+return node->md->policy_is_reject_star;
   else
 return 1;
 }



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

[tor-commits] [tor/master] Add tests for IPv6 exit policies on microdescriptors

[asn]

commit 0127888b0623696d654125b4fa69200485e65a7f
Author: Neel Chauhan 
Date:   Sun Aug 25 22:32:07 2019 -0400

Add tests for IPv6 exit policies on microdescriptors
---
 src/test/test_microdesc.c | 52 ++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 53ee79918..ad211c7ea 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -648,6 +648,41 @@ static const char MD_PARSE_TEST_DATA[] =
   "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n"
   "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n"
   "p6 allow 80\n"
+  /* Good 11: Normal, non-exit relay with ipv6 address */
+  "onion-key\n"
+  "-BEGIN RSA PUBLIC KEY-\n"
+  "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n"
+  "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n"
+  "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n"
+  "-END RSA PUBLIC KEY-\n"
+  "a [::1:2:3:4]:9090\n"
+  "a 18.0.0.1:\n"
+  "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n"
+  "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n"
+  /* Good 12: Normal, exit relay with ipv6 address */
+  "onion-key\n"
+  "-BEGIN RSA PUBLIC KEY-\n"
+  "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n"
+  "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n"
+  "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n"
+  "-END RSA PUBLIC KEY-\n"
+  "a [::1:2:3:4]:9090\n"
+  "a 18.0.0.1:\n"
+  "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n"
+  "p accept 20-23,43,53,79-81,88,110,143,194,220,389,443,464,531,543-544\n"
+  "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n"
+  /* Good 13: Normal, exit relay with only ipv6 exit policy */
+  "onion-key\n"
+  "-BEGIN RSA PUBLIC KEY-\n"
+  "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n"
+  "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n"
+  "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n"
+  "-END RSA PUBLIC KEY-\n"
+  "a [::1:2:3:4]:9090\n"
+  "a 18.0.0.1:\n"
+  "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n"
+  "p6 accept 20-23,43,53,79-81,88,110,143,194,220,389,443,464,531,543-544\n"
+  "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n"
   ;
 #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS
 ENABLE_GCC_WARNING(overlength-strings)
@@ -665,7 +700,7 @@ test_md_parse(void *arg)
   smartlist_t *mds = microdescs_parse_from_string(MD_PARSE_TEST_DATA,
   NULL, 1, SAVED_NOWHERE,
   invalid);
-  tt_int_op(smartlist_len(mds), OP_EQ, 11);
+  tt_int_op(smartlist_len(mds), OP_EQ, 14);
   tt_int_op(smartlist_len(invalid), OP_EQ, 4);
 
   test_memeq_hex(smartlist_get(invalid,0),
@@ -712,6 +747,21 @@ test_md_parse(void *arg)
   tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6);
   tt_int_op(md->ipv6_orport, OP_EQ, 9090);
 
+  md = smartlist_get(mds, 11);
+  tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6);
+  tt_int_op(md->ipv6_orport, OP_EQ, 9090);
+  tt_int_op(md->policy_is_reject_star, OP_EQ, 1);
+
+  md = smartlist_get(mds, 12);
+  tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6);
+  tt_int_op(md->ipv6_orport, OP_EQ, 9090);
+  tt_int_op(md->policy_is_reject_star, OP_EQ, 0);
+
+  md = smartlist_get(mds, 13);
+  tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6);
+  tt_int_op(md->ipv6_orport, OP_EQ, 9090);
+  tt_int_op(md->policy_is_reject_star, OP_EQ, 0);
+
  done:
   SMARTLIST_FOREACH(mds, microdesc_t *, mdsc, microdesc_free(mdsc));
   smartlist_free(mds);



___
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 'tor-github/pr/1261'

[asn]

commit cdd7e889703fbc089780f446715b7b41ccbf688e
Merge: 2591440fa 0127888b0
Author: George Kadianakis 
Date:   Thu Sep 5 17:02:53 2019 +0300

Merge branch 'tor-github/pr/1261'

 changes/bug27284   |  5 
 src/feature/dirparse/microdesc_parse.c | 11 +++
 src/feature/nodelist/microdesc_st.h|  2 ++
 src/feature/nodelist/nodelist.c|  3 +-
 src/test/test_microdesc.c  | 52 +-
 5 files changed, 70 insertions(+), 3 deletions(-)

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

[tor-commits] [community/master] Add code of conduct from remote repository

[hiro]

commit fb39e68719548fb7a3345a85958e969988152478
Author: hiro 
Date:   Thu Sep 5 15:59:17 2019 +0200

Add code of conduct from remote repository
---
 content/training/code-of-conduct/contents.lr | 2 +-
 lego | 2 +-
 templates/two-columns-page.html  | 7 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/content/training/code-of-conduct/contents.lr 
b/content/training/code-of-conduct/contents.lr
index 0f3eab0..6d39f0d 100644
--- a/content/training/code-of-conduct/contents.lr
+++ b/content/training/code-of-conduct/contents.lr
@@ -20,6 +20,6 @@ html: two-columns-page.html
 ---
 body:
 
-##Code of Conduct for Trainers
+## Code of Conduct for Trainers
 
 The Tor Project is committed to fostering an inclusive environment and 
community. Tor is a place where people should feel safe to engage, share their 
point of view, and participate. You can find our code of conduct 
[here](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt)
diff --git a/lego b/lego
index 62b25f1..4911d14 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 62b25f1cba4a7af931ccd8f4420d0669812db09c
+Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 4ccb30e..199a452 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -14,6 +14,11 @@
 
 {% endfor %}
 
+
+{% if this.path == "/training/code-of-conduct" %}
+  {{ 
render_text("https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt";)|safe
 }}
+{% endif %}
+
 
   
 
@@ -23,4 +28,4 @@
   
 
   
-
\ No newline at end of file
+

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

[tor-commits] [lego/master] Fix plugin

[hiro]

commit 4911d14b482d292742f5f0e30130e4b6817f56f8
Author: hiro 
Date:   Thu Sep 5 15:57:25 2019 +0200

Fix plugin
---
 packages/txt-to-html/lektor_txt_to_html.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/txt-to-html/lektor_txt_to_html.py 
b/packages/txt-to-html/lektor_txt_to_html.py
index 48b86d1..3fba7e9 100644
--- a/packages/txt-to-html/lektor_txt_to_html.py
+++ b/packages/txt-to-html/lektor_txt_to_html.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #pylint: disable=wrong-import-position
 import sys
 
@@ -18,7 +18,8 @@ class TxtToHtmlPlugin(Plugin):
 
 def text(url=None):
 webFile = request.urlopen(url)
-content = webFile.read()
+charset = webFile.info().get_content_charset()
+content = webFile.read().decode(charset)
 text ="" + content + ""
 
 return text

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

[tor-commits] [lego/master] Fix typo

[hiro]

commit 16edbaec21f976e6ebc1b28dd2f804aa8f3246c4
Author: hiro 
Date:   Thu Sep 5 15:52:53 2019 +0200

Fix typo
---
 packages/txt-to-html/lektor_txt_to_html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/txt-to-html/lektor_txt_to_html.py 
b/packages/txt-to-html/lektor_txt_to_html.py
index 4c5ae3d..48b86d1 100644
--- a/packages/txt-to-html/lektor_txt_to_html.py
+++ b/packages/txt-to-html/lektor_txt_to_html.py
@@ -16,7 +16,7 @@ class TxtToHtmlPlugin(Plugin):
 
 def on_setup_env(self, **extra):
 
-def stream(url=None):
+def text(url=None):
 webFile = request.urlopen(url)
 content = webFile.read()
 text ="" + content + ""

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

[tor-commits] [lego/master] Fix typo

[hiro]

commit b5691c8332c7957a4427bd8798c17239d9685424
Author: hiro 
Date:   Thu Sep 5 15:52:03 2019 +0200

Fix typo
---
 packages/txt-to-html/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/txt-to-html/setup.py b/packages/txt-to-html/setup.py
index 82416d2..63cd871 100644
--- a/packages/txt-to-html/setup.py
+++ b/packages/txt-to-html/setup.py
@@ -10,7 +10,7 @@ setup(
 py_modules=['lektor_txt_to_html'],
 entry_points={
 'lektor.plugins': [
-'xml-to-html = lektor_txt_to_html:TxtToHtmlPlugin',
+'txt-to-html = lektor_txt_to_html:TxtToHtmlPlugin',
 ]
 }
 )

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

[tor-commits] [lego/master] Rename plugin

[hiro]

commit 6d3efb7096fa60561df56f873601a655ecabf1b7
Author: hiro 
Date:   Thu Sep 5 15:51:01 2019 +0200

Rename plugin
---
 packages/{txt-to-markdown => txt-to-html}/LICENSE|  0
 packages/{txt-to-markdown => txt-to-html}/README |  0
 packages/{txt-to-markdown => txt-to-html}/README.md  |  0
 .../lektor_txt_to_html.py}   |  4 ++--
 packages/txt-to-html/setup.py| 16 
 packages/txt-to-markdown/setup.py| 16 
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/txt-to-markdown/LICENSE b/packages/txt-to-html/LICENSE
similarity index 100%
rename from packages/txt-to-markdown/LICENSE
rename to packages/txt-to-html/LICENSE
diff --git a/packages/txt-to-markdown/README b/packages/txt-to-html/README
similarity index 100%
rename from packages/txt-to-markdown/README
rename to packages/txt-to-html/README
diff --git a/packages/txt-to-markdown/README.md b/packages/txt-to-html/README.md
similarity index 100%
rename from packages/txt-to-markdown/README.md
rename to packages/txt-to-html/README.md
diff --git a/packages/txt-to-markdown/lektor_txt_to_markdown.py 
b/packages/txt-to-html/lektor_txt_to_html.py
similarity index 81%
rename from packages/txt-to-markdown/lektor_txt_to_markdown.py
rename to packages/txt-to-html/lektor_txt_to_html.py
index ae3bc05..4c5ae3d 100644
--- a/packages/txt-to-markdown/lektor_txt_to_markdown.py
+++ b/packages/txt-to-html/lektor_txt_to_html.py
@@ -9,9 +9,9 @@ from lektor.pluginsystem import Plugin
 from urllib import request
 
 
-class TxtToMarkdownPlugin(Plugin):
+class TxtToHtmlPlugin(Plugin):
 name = u'TXT to Markdown'
-description = u'Lektor plugin to add a remote TXT doc into Markdown.'
+description = u'Lektor plugin to add a remote TXT doc into HTML.'
 
 
 def on_setup_env(self, **extra):
diff --git a/packages/txt-to-html/setup.py b/packages/txt-to-html/setup.py
new file mode 100644
index 000..82416d2
--- /dev/null
+++ b/packages/txt-to-html/setup.py
@@ -0,0 +1,16 @@
+from setuptools import setup
+
+setup(
+name='lektor-txt-to-html',
+version='0.1',
+author=u'Hiro',
+author_email='h...@torproject.org',
+url='https://github.com/torproject/lego/packages/txt-to-html',
+license='GPL',
+py_modules=['lektor_txt_to_html'],
+entry_points={
+'lektor.plugins': [
+'xml-to-html = lektor_txt_to_html:TxtToHtmlPlugin',
+]
+}
+)
diff --git a/packages/txt-to-markdown/setup.py 
b/packages/txt-to-markdown/setup.py
deleted file mode 100644
index 7633c38..000
--- a/packages/txt-to-markdown/setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from setuptools import setup
-
-setup(
-name='lektor-txt-to-markdown',
-version='0.1',
-author=u'Hiro',
-author_email='h...@torproject.org',
-url='https://github.com/torproject/lego/packages/txt-to-markdown',
-license='GPL',
-py_modules=['lektor_txt_to_markdown'],
-entry_points={
-'lektor.plugins': [
-'xml-to-html = lektor_txt_to_markdown:TxtToMarkdownPlugin',
-]
-}
-)

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

[tor-commits] [tpo/master] Insert line breaks between sentences

[emmapeel]

commit 3c6c67a6598276b94a5974ec5b0c8443b4a118c9
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Thu Sep 5 08:23:14 2019 -0400

Insert line breaks between sentences

This creates smaller strings on each line which are easier to translate.
---
 content/about/trademark/trademark-faq/trademark-faq-1/contents.lr | 5 -
 content/about/trademark/trademark-faq/trademark-faq-2/contents.lr | 4 +++-
 content/about/trademark/trademark-faq/trademark-faq-3/contents.lr | 5 -
 content/about/trademark/trademark-faq/trademark-faq-4/contents.lr | 4 +++-
 content/about/trademark/trademark-faq/trademark-faq-5/contents.lr | 8 +++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
index 0d60105..868bf04 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
@@ -7,4 +7,7 @@ _hidden: yes
 seo_slug: how-to-use-tor-trademark
 ---
 description:
-The Tor Project encourages developers to use the name Tor in ways that do not 
confuse the public about the source of anonymity software and services. If you 
are building open-source non-commercial software or services that incorporate 
or work with The Tor Project's code, you may use the name “Tor” in an 
accurate description of your work. We ask you to include a link to the official 
Tor website https://www.torproject.org/ so users can verify the original source 
of Tor for themselves, and a note indicating that your project is not sponsored 
by The Tor Project. For example, “This product is produced independently from 
the Tor® anonymity software and carries no guarantee from The Tor Project 
about quality, suitability or anything else.”
+The Tor Project encourages developers to use the name Tor in ways that do not 
confuse the public about the source of anonymity software and services.
+If you are building open-source non-commercial software or services that 
incorporate or work with The Tor Project's code, you may use the name “Tor” 
in an accurate description of your work.
+We ask you to include a link to the official Tor website 
https://www.torproject.org/ so users can verify the original source of Tor for 
themselves, and a note indicating that your project is not sponsored by The Tor 
Project.
+For example, “This product is produced independently from the Tor® 
anonymity software and carries no guarantee from The Tor Project about quality, 
suitability or anything else.”
diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
index 7e6fc04..48c3110 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
@@ -7,4 +7,6 @@ _hidden: yes
 seo_slug: can-I-use-tor-onion-logo
 ---
 description:
-If you're making non-commercial use of Tor software, you may also use the Tor 
onion logo (as an illustration, not as a brand for your products). Please don't 
modify the design or colors of the logo. You can use items that look like the 
Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for 
instance), so long as they're not used as logos in ways that would confuse 
people.
+If you're making non-commercial use of Tor software, you may also use the Tor 
onion logo (as an illustration, not as a brand for your products).
+Please don't modify the design or colors of the logo.
+You can use items that look like the Tor onion logo to illustrate a point 
(e.g. an exploded onion with layers, for instance), so long as they're not used 
as logos in ways that would confuse people.
diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
index 06c3770..009c265 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
@@ -7,4 +7,7 @@ _hidden: yes
 seo_slug: tor-product-domain-name
 ---
 description:
-Please don't use Tor in your product name or domain name. Instead, find a name 
that will accurately identify your products or services. Remember that our goal 
is to make sure that people aren't confused about whether your product or 
project is made or endorsed by The Tor Project. Creating a new brand that 
incorporates the Tor brand is likely to lead to confusion, and commercial 
confusion is a sign of trademark infringement.
+Please don't use Tor in your product name or domain name.
+Instead, find a name that will accurately identify your products or services.
+Remember that our goal is to make sure that people aren't confused about 
whether your product or project is made or endorsed by The Tor Project.
+Crea

[tor-commits] [lego/master] Add txt to html plugin

[hiro]

commit 99136c549fe398b0c56e4b608aab45a0455b84fd
Author: hiro 
Date:   Thu Sep 5 15:34:13 2019 +0200

Add txt to html plugin
---
 packages/txt-to-markdown/LICENSE   | 674 +
 packages/txt-to-markdown/README|   3 +
 packages/txt-to-markdown/README.md |  26 +
 packages/txt-to-markdown/lektor_txt_to_markdown.py |  26 +
 packages/txt-to-markdown/setup.py  |  16 +
 5 files changed, 745 insertions(+)

diff --git a/packages/txt-to-markdown/LICENSE b/packages/txt-to-markdown/LICENSE
new file mode 100644
index 000..9cecc1d
--- /dev/null
+++ b/packages/txt-to-markdown/LICENSE
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulti

[tor-commits] [lego/master] add breadcrumb template

[antonela]

commit f0331cadae140a9c79015bf7a757fcdfe52673cd
Author: Antonela 
Date:   Thu Sep 5 09:40:20 2019 -0400

add breadcrumb template
---
 templates/breadcrumb.html | 13 +
 1 file changed, 13 insertions(+)

diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html
new file mode 100644
index 000..6f99a4d
--- /dev/null
+++ b/templates/breadcrumb.html
@@ -0,0 +1,13 @@
+
+  
+  {% set root = site.get('/') %}
+  {% for child in root.children recursive %}
+{{ child.title }}
+  {% if this.is_child_of(child) %}
+  {{ loop(child.children) }}
+  {% endif %}
+
+  {% endfor %}
+  
+

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

[tor-commits] [tor-browser-build/master] Fold in stable Changelog

[gk]

commit 21a73d6109f1e1f68b2dc9f7f2ca4a5922bcdd0a
Author: Georg Koppen 
Date:   Thu Sep 5 13:37:46 2019 +

Fold in stable Changelog
---
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++
 1 file changed, 24 insertions(+)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index bd20859..2cf1c5a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -85,6 +85,30 @@ Tor Browser 9.0a6 -- September 4 2019
* Bug 30461: Update tor-android-service project to use Firefox 68 
toolchain
  * Bug 28753: Use Gradle with --offline when building the browser part
 
+Tor Browser 8.5.5 -- September 3 2019
+ * All platforms
+   * Update Firefox to 60.9.0esr
+   * Update Torbutton to 2.1.13
+ * Bug 31520: Remove monthly giving banner from Tor Browser
+ * Bug 31140: Do not enable IonMonkey on AARCH64
+ * Translations update
+   * Update NoScript to 11.0.3
+ * Bug 26847: NoScript pops up a full-site window for XSS warning
+ * Bug 31287: NoScript leaks browser locale
+   * Bug 31357: Retire Tom's default obfs4 bridge
+ * Windows + OS X + Linux
+   * Update Tor to 0.4.1.5
+ * Windows
+   * Bug 31547: Back out patch for Mozilla's bug 1574980
+   * Bug 27503: Provide full support for accessibility tools
+   * Bug 30575: Don't allow enterprise policies in Tor Browser
+   * Bug 31141: Fix typo in font.system.whitelist
+ * Android
+   * Bug 28119: Tor Browser for aarch64
+ * Build System
+   * All platforms
+ * Bug 31465: Bump Go to 1.12.9
+
 Tor Browser 9.0a5 -- July 31 2019
  * Android
* Bug 31260: Backport bug 1477259 for aarch64 support on Google Play

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

[tor-commits] [onionoo/master] Adds GitLab CI for tests and checks

[karsten]

commit 5173fe1d73c32342be937160d4974bd446c45e57
Author: Iain R. Learmonth 
Date:   Thu Sep 5 12:26:45 2019 +0100

Adds GitLab CI for tests and checks

Configuration is held in the .gitlab-ci.yml file.

Fixes: #31400
---
 .gitlab-ci.yml | 25 +
 1 file changed, 25 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000..b67b5a4
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+variables:
+  GIT_STRATEGY: clone
+  METRICS_LIB_VERSION: "2.6.2"
+  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
+
+stages:
+ - test
+
+test:
+ stage: test
+ image: debian:buster
+ script:
+  - apt update
+  - apt -y install default-jdk ant ivy git curl
+  - git submodule init
+  - git submodule update
+  - mkdir lib
+  - mkdir tmp
+  - pushd tmp
+  - curl 
https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz
 | tar xzf -
+  - popd
+  - mv 
tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar
 lib
+  - ant -lib /usr/share/java resolve
+  - ant test
+  - ant checks



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

[tor-commits] [onionoo/master] Increase timeout for testCountryDeDe

[karsten]

commit 4ba7b00c6f4080955af907e1dbf9dd0c79fb9a58
Author: Iain R. Learmonth 
Date:   Thu Sep 5 14:10:44 2019 +0100

Increase timeout for testCountryDeDe

The timeout was being reached in the GitLab CI environment, which is not
super powerful.
---
 .../java/org/torproject/metrics/onionoo/server/ResourceServletTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java 
b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java
index 7c3c52e..935c06e 100644
--- 
a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java
+++ 
b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java
@@ -1134,7 +1134,7 @@ public class ResourceServletTest {
 null);
   }
 
-  @Test(timeout = 200)
+  @Test(timeout = 400)
   public void testCountryDeDe() {
 this.assertSummaryDocument(
 "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0,

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

[tor-commits] [metrics-lib/master] Adds GitLab CI for tests and checks

[karsten]

commit 4d8a8ea711828325371b9ec351021b7739ea06ac
Author: Iain R. Learmonth 
Date:   Tue Aug 6 16:08:26 2019 +0100

Adds GitLab CI for tests and checks

Configuration is held in the .gitlab-ci.yml file.

Fixes: #31645
---
 .gitlab-ci.yml | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000..7abea88
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+variables:
+  GIT_STRATEGY: clone
+
+stages:
+ - test
+
+test:
+ stage: test
+ image: debian:buster
+ script:
+  - apt update
+  - apt -y install default-jdk ant ivy git
+  - git submodule init
+  - git submodule update
+  - mkdir lib
+  - ant -lib /usr/share/java resolve
+  - ant test
+  - ant checks

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

[tor-commits] [exonerator/master] Adds GitLab CI for tests and checks

[karsten]

commit 64782695e66679f485eeaa6030a80ec01598c25c
Author: Iain R. Learmonth 
Date:   Thu Sep 5 13:59:05 2019 +0100

Adds GitLab CI for tests and checks

Configuration is held in the .gitlab-ci.yml file.

Fixes: #31401
---
 .gitlab-ci.yml | 25 +
 1 file changed, 25 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000..b67b5a4
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+variables:
+  GIT_STRATEGY: clone
+  METRICS_LIB_VERSION: "2.6.2"
+  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
+
+stages:
+ - test
+
+test:
+ stage: test
+ image: debian:buster
+ script:
+  - apt update
+  - apt -y install default-jdk ant ivy git curl
+  - git submodule init
+  - git submodule update
+  - mkdir lib
+  - mkdir tmp
+  - pushd tmp
+  - curl 
https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz
 | tar xzf -
+  - popd
+  - mv 
tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar
 lib
+  - ant -lib /usr/share/java resolve
+  - ant test
+  - ant checks

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

[tor-commits] [collector/master] Adds GitLab CI for tests and checks

[karsten]

commit a8a4961a1b49a3104dd37ac93cc41e3f908e25c5
Author: Iain R. Learmonth 
Date:   Thu Sep 5 12:21:43 2019 +0100

Adds GitLab CI for tests and checks

Configuration is held in the .gitlab-ci.yml file.

Fixes: #31399
---
 .gitlab-ci.yml | 25 +
 1 file changed, 25 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000..b67b5a4
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+variables:
+  GIT_STRATEGY: clone
+  METRICS_LIB_VERSION: "2.6.2"
+  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
+
+stages:
+ - test
+
+test:
+ stage: test
+ image: debian:buster
+ script:
+  - apt update
+  - apt -y install default-jdk ant ivy git curl
+  - git submodule init
+  - git submodule update
+  - mkdir lib
+  - mkdir tmp
+  - pushd tmp
+  - curl 
https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz
 | tar xzf -
+  - popd
+  - mv 
tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar
 lib
+  - ant -lib /usr/share/java resolve
+  - ant test
+  - ant checks

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

[tor-commits] [tpo/master] Add Trademark content

[hiro]

commit cee1e598a4238a532155d72bfdb2c3028f860d29
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 12:06:26 2019 -0400

Add Trademark content
---
 content/about/trademark/contents.lr | 59 +
 templates/trademark.html|  1 +
 2 files changed, 60 insertions(+)

diff --git a/content/about/trademark/contents.lr 
b/content/about/trademark/contents.lr
new file mode 100644
index 000..1f2d76f
--- /dev/null
+++ b/content/about/trademark/contents.lr
@@ -0,0 +1,59 @@
+_template: about.html
+---
+section: About
+---
+section_id: about
+---
+html: trademark.html
+---
+color: primary
+---
+title: Trademark
+---
+body:
+# General Statement of Trademark and Copyright
+
+Content on this site is Copyright The Tor Project, Inc.. Reproduction of 
content is permitted under a [Creative Commons Attribution 3.0 United States 
License](https://creativecommons.org/licenses/by/3.0/us/). All use under such 
license must be accompanied by a clear and prominent attribution that 
identifies The Tor Project, Inc. as the owner and originator of such content. 
The Tor Project Inc. reserves the right to change licenses and permissions at 
any time in its sole discretion.
+
+The Tor® software is licensed in various ways. Learn more about the [various 
licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor).
+
+# Tor Trademark Frequently Asked Questions
+## How can I use the name "Tor"?
+
+The Tor Project encourages developers to use the name Tor in ways that do not 
confuse the public about the source of anonymity software and services. If you 
are building open-source non-commercial software or services that incorporate 
or work with The Tor Project's code, you may use the name “Tor” in an 
accurate description of your work. We ask you to include a link to the official 
Tor website https://www.torproject.org/ so users can verify the original source 
of Tor for themselves, and a note indicating that your project is not sponsored 
by The Tor Project. For example, “This product is produced independently from 
the Tor® anonymity software and carries no guarantee from The Tor Project 
about quality, suitability or anything else.”
+
+## Can I use the Tor onion logo?
+
+If you're making non-commercial use of Tor software, you may also use the Tor 
onion logo (as an illustration, not as a brand for your products). Please don't 
modify the design or colors of the logo. You can use items that look like the 
Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for 
instance), so long as they're not used as logos in ways that would confuse 
people.
+
+## Can I use the word "Tor" as part of the name of my product or my domain 
name?
+
+Please don't use Tor in your product name or domain name. Instead, find a name 
that will accurately identify your products or services. Remember that our goal 
is to make sure that people aren't confused about whether your product or 
project is made or endorsed by The Tor Project. Creating a new brand that 
incorporates the Tor brand is likely to lead to confusion, and commercial 
confusion is a sign of trademark infringement.
+
+## What about cute Tor-derived names in research paper titles?
+
+Tor enjoys a vibrant [research community](https://research.torproject.org/) 
that examines anonymity attacks and defenses, design improvements, impact on 
society, and so on. We think it's great that professors and other researchers 
continue to contribute to our community, and we've even gotten funding from the 
National Science Foundation to help keep the Tor design and code 
researcher-friendly. The [anonymity 
bibliography](http://freehaven.net/anonbib/) lists many research papers that 
use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, 
Torchestra, StegoTorus, and more.
+
+Since the authors of these research papers aren't trying to make a profit from 
them, and (because they're just papers, not products) the papers aren't 
confusing Tor users into running potentially unsafe software, we believe that 
the use of the Tor mark in these research paper titles is acceptable 
non-trademark or fair use.
+
+That said, if the research paper comes with software, and that software could 
potentially confuse people (users or other researchers) about whether it's 
written or endorsed by The Tor Project, then we're back to the [above 
scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combining).
+
+## Does this mean you're enforcing trademark rights?
+
+The Tor Project is a non-profit corporation organized to research and develop 
the Tor anonymity software and network. We don't want to be trademark bullies, 
but we will use trademark to protect the public's ability to recognize Tor 
Project software. Trademark law helps us to assure that the name is used only 
in connection with genuine Tor anonymity software and for accurate description 
of softwa

[tor-commits] [tpo/master] Fix "Edit this page" so it links to torproject/tpo

[hiro]

commit c85db58f7b17e9bb663393e390676e64c02586e4
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 13:32:40 2019 -0400

Fix "Edit this page" so it links to torproject/tpo
---
 templates/macros/question.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/macros/question.html b/templates/macros/question.html
index 53c0065..8a2501f 100644
--- a/templates/macros/question.html
+++ b/templates/macros/question.html
@@ -11,7 +11,7 @@
   
  
  
-   https://github.com/torproject/support/edit/master/content{{ item.path 
}}/contents.lr">{{ _("Edit this page") }} -
+   https://github.com/torproject/tpo/edit/master/content{{ 
item.path }}/contents.lr">{{ _("Edit this page") }} -
https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback";>{{
 _("Suggest Feedback") }} -
{{ _("Permalink") }}
   



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

[tor-commits] [tpo/master] Add link to Contact page in `trademark-faq-6`

[hiro]

commit 573b4026f0bc4f669029af5f0b35c7bf0f51e11c
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 15:01:13 2019 -0400

Add link to Contact page in `trademark-faq-6`
---
 content/about/trademark/trademark-faq/trademark-faq-6/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr
index 2335d60..32dd43e 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr
@@ -5,4 +5,4 @@ title: What if I produce non-open source, commercial products 
based on Tor?
 seo_slug: commercial-tor-derivatives
 ---
 description:
-Contact us, and let's talk.
+[Contact us](/contact), and let's talk.



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

[tor-commits] [tpo/master] Fix trademark models and templates

[hiro]

commit 593f085a54a3eae28732e4f8bb705c5cc8e1a8d8
Author: hiro 
Date:   Thu Sep 5 15:22:04 2019 +0200

Fix trademark models and templates
---
 content/about/trademark/contents.lr|  5 
 content/about/trademark/trademark-faq/contents.lr  | 12 +++-
 .../trademark-faq/trademark-faq-1/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-2/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-3/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-4/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-5/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-6/contents.lr  |  2 ++
 .../trademark-faq/trademark-faq-7/contents.lr  |  2 ++
 models/question.ini|  1 +
 models/trademark.ini   | 34 ++
 templates/about.html   |  9 +-
 templates/macros/topic.html|  2 +-
 templates/trademark.html   |  2 +-
 14 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/content/about/trademark/contents.lr 
b/content/about/trademark/contents.lr
index bc35d46..1dc524d 100644
--- a/content/about/trademark/contents.lr
+++ b/content/about/trademark/contents.lr
@@ -1,14 +1,19 @@
+_model: trademark
+---
 _template: about.html
 ---
 section: About
 ---
 section_id: about
 ---
+color: primary
+---
 html: trademark.html
 ---
 title: Trademark
 ---
 body:
+
 # General Statement of Trademark and Copyright
 
 Content on this site is Copyright The Tor Project, Inc.. Reproduction of 
content is permitted under a [Creative Commons Attribution 3.0 United States 
License](https://creativecommons.org/licenses/by/3.0/us/). All use under such 
license must be accompanied by a clear and prominent attribution that 
identifies The Tor Project, Inc. as the owner and originator of such content. 
The Tor Project Inc. reserves the right to change licenses and permissions at 
any time in its sole discretion.
diff --git a/content/about/trademark/trademark-faq/contents.lr 
b/content/about/trademark/trademark-faq/contents.lr
index 35a1f52..464fb37 100644
--- a/content/about/trademark/trademark-faq/contents.lr
+++ b/content/about/trademark/trademark-faq/contents.lr
@@ -1,5 +1,15 @@
 _model: topic
 ---
+_template: about.html
+---
+section: About
+---
+section_id: about
+---
+html: trademark.html
+---
+color: primary
+---
 title: Tor Trademark Frequently Asked Questions
 ---
-seo_slug: Tor Trademark FAQs
+seo_slug: tor-trademark-faqs
diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
index 9c53669..0d60105 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr
@@ -2,6 +2,8 @@ _model: question
 ---
 title: How can I use the name "Tor"?
 ---
+_hidden: yes
+---
 seo_slug: how-to-use-tor-trademark
 ---
 description:
diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
index a8ac499..7e6fc04 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr
@@ -2,6 +2,8 @@ _model: question
 ---
 title: Can I use the Tor onion logo?
 ---
+_hidden: yes
+---
 seo_slug: can-I-use-tor-onion-logo
 ---
 description:
diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
index a7fe8bb..06c3770 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr
@@ -2,6 +2,8 @@ _model: question
 ---
 title: Can I use the word "Tor" as part of the name of my product or my domain 
name?
 ---
+_hidden: yes
+---
 seo_slug: tor-product-domain-name
 ---
 description:
diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
index 534a68b..80a8b9e 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
@@ -2,6 +2,8 @@ _model: question
 ---
 title: What about cute Tor-derived names in research paper titles?
 ---
+_hidden: yes
+---
 seo_slug: tor-derived-names
 ---
 description:
diff --git a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr
index 8f74633..e621368 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr
@@ -2,6 +2,8 @@ _model: question
 ---
 title: Does this mean you're enforcing trademark rights?
 ---
+_hidden: yes
+---
 seo_slug: enforcing-trademark-rights
 

[tor-commits] [tpo/master] Add Trademark tab to About

[hiro]

commit 375c924c624dbfa2c7354492c2289809ef08b7c9
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 12:06:30 2019 -0400

Add Trademark tab to About
---
 databags/about+en.ini | 4 
 1 file changed, 4 insertions(+)

diff --git a/databags/about+en.ini b/databags/about+en.ini
index 43f44fd..8322613 100644
--- a/databags/about+en.ini
+++ b/databags/about+en.ini
@@ -17,3 +17,7 @@ label = Reports
 [jobs]
 path = about/jobs
 label = Jobs
+
+[trademark]
+path = about/trademark
+label = Trademark



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

[tor-commits] [tpo/master] Fix question permalinks

[hiro]

commit 5c20a565298dc373408bc055d370258ed8e748f6
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 13:39:39 2019 -0400

Fix question permalinks
---
 templates/macros/question.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/macros/question.html b/templates/macros/question.html
index 8a2501f..1b5fa59 100644
--- a/templates/macros/question.html
+++ b/templates/macros/question.html
@@ -13,7 +13,7 @@
  
https://github.com/torproject/tpo/edit/master/content{{ 
item.path }}/contents.lr">{{ _("Edit this page") }} -
https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback";>{{
 _("Suggest Feedback") }} -
-   {{ _("Permalink") }}
+   {{ 
_("Permalink") }}
   

 



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

[tor-commits] [tpo/master] Modify link in `trademark-faq-4`

[hiro]

commit 4d7d44939c1281e9feaa46c4b85a6b6ab88ad2ba
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 14:57:20 2019 -0400

Modify link in `trademark-faq-4`

Now it links to the "Can I use the word "Tor"" question on the new page.
---
 content/about/trademark/trademark-faq/trademark-faq-4/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr 
b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
index b366a4d..534a68b 100644
--- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
+++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr
@@ -9,4 +9,4 @@ Tor enjoys a vibrant [research 
community](https://research.torproject.org/) that
 
 Since the authors of these research papers aren't trying to make a profit from 
them, and (because they're just papers, not products) the papers aren't 
confusing Tor users into running potentially unsafe software, we believe that 
the use of the Tor mark in these research paper titles is acceptable 
non-trademark or fair use.
 
-That said, if the research paper comes with software, and that software could 
potentially confuse people (users or other researchers) about whether it's 
written or endorsed by The Tor Project, then we're back to the [above 
scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combining).
+That said, if the research paper comes with software, and that software could 
potentially confuse people (users or other researchers) about whether it's 
written or endorsed by The Tor Project, then we're back to the [above 
scenario](../../#trademark-faq-3).



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

[tor-commits] [tpo/master] Add styling to questions

[hiro]

commit 5cd97c37da2f87e9e8192b17b54354bfef80d14f
Author: RotationMatrix <52428419+rotationmat...@users.noreply.github.com>
Date:   Wed Sep 4 13:24:22 2019 -0400

Add styling to questions

Reuses topic and question models from web/support.
---
 content/about/trademark/contents.lr| 43 --
 content/about/trademark/trademark-faq/contents.lr  |  5 +++
 .../trademark-faq/trademark-faq-1/contents.lr  |  8 
 .../trademark-faq/trademark-faq-2/contents.lr  |  8 
 .../trademark-faq/trademark-faq-3/contents.lr  |  8 
 .../trademark-faq/trademark-faq-4/contents.lr  | 12 ++
 .../trademark-faq/trademark-faq-5/contents.lr  | 13 +++
 .../trademark-faq/trademark-faq-6/contents.lr  |  8 
 .../trademark-faq/trademark-faq-7/contents.lr  | 11 ++
 models/question.ini| 19 ++
 models/topic.ini   | 23 
 templates/macros/question.html | 22 +++
 templates/macros/topic.html| 18 +
 templates/question.html|  6 +++
 templates/topic.html   |  6 +++
 templates/trademark.html   |  7 +++-
 16 files changed, 173 insertions(+), 44 deletions(-)

diff --git a/content/about/trademark/contents.lr 
b/content/about/trademark/contents.lr
index 1f2d76f..bc35d46 100644
--- a/content/about/trademark/contents.lr
+++ b/content/about/trademark/contents.lr
@@ -6,8 +6,6 @@ section_id: about
 ---
 html: trademark.html
 ---
-color: primary

 title: Trademark
 ---
 body:
@@ -16,44 +14,3 @@ body:
 Content on this site is Copyright The Tor Project, Inc.. Reproduction of 
content is permitted under a [Creative Commons Attribution 3.0 United States 
License](https://creativecommons.org/licenses/by/3.0/us/). All use under such 
license must be accompanied by a clear and prominent attribution that 
identifies The Tor Project, Inc. as the owner and originator of such content. 
The Tor Project Inc. reserves the right to change licenses and permissions at 
any time in its sole discretion.
 
 The Tor® software is licensed in various ways. Learn more about the [various 
licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor).
-
-# Tor Trademark Frequently Asked Questions
-## How can I use the name "Tor"?
-
-The Tor Project encourages developers to use the name Tor in ways that do not 
confuse the public about the source of anonymity software and services. If you 
are building open-source non-commercial software or services that incorporate 
or work with The Tor Project's code, you may use the name “Tor” in an 
accurate description of your work. We ask you to include a link to the official 
Tor website https://www.torproject.org/ so users can verify the original source 
of Tor for themselves, and a note indicating that your project is not sponsored 
by The Tor Project. For example, “This product is produced independently from 
the Tor® anonymity software and carries no guarantee from The Tor Project 
about quality, suitability or anything else.”
-
-## Can I use the Tor onion logo?
-
-If you're making non-commercial use of Tor software, you may also use the Tor 
onion logo (as an illustration, not as a brand for your products). Please don't 
modify the design or colors of the logo. You can use items that look like the 
Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for 
instance), so long as they're not used as logos in ways that would confuse 
people.
-
-## Can I use the word "Tor" as part of the name of my product or my domain 
name?
-
-Please don't use Tor in your product name or domain name. Instead, find a name 
that will accurately identify your products or services. Remember that our goal 
is to make sure that people aren't confused about whether your product or 
project is made or endorsed by The Tor Project. Creating a new brand that 
incorporates the Tor brand is likely to lead to confusion, and commercial 
confusion is a sign of trademark infringement.
-
-## What about cute Tor-derived names in research paper titles?
-
-Tor enjoys a vibrant [research community](https://research.torproject.org/) 
that examines anonymity attacks and defenses, design improvements, impact on 
society, and so on. We think it's great that professors and other researchers 
continue to contribute to our community, and we've even gotten funding from the 
National Science Foundation to help keep the Tor design and code 
researcher-friendly. The [anonymity 
bibliography](http://freehaven.net/anonbib/) lists many research papers that 
use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, 
Torchestra, StegoTorus, and more.
-
-Since the authors of these research papers aren't trying to make a profit from 
them, and (because they're just papers, not products) the papers aren't 
confusing To

[tor-commits] [lego/master] add sticky submenu

[antonela]

commit 5d6dfa45cb04f99d557ce79eef6b82dc6e2df721
Author: Antonela 
Date:   Thu Sep 5 09:23:19 2019 -0400

add sticky submenu

close https://dip.torproject.org/web/tpo/issues/13
---
 templates/pagenav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/pagenav.html b/templates/pagenav.html
index 1993909..c242baf 100644
--- a/templates/pagenav.html
+++ b/templates/pagenav.html
@@ -1,4 +1,4 @@
-
+
   
 
   

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

[tor-commits] [metrics-web/master] Adds GitLab CI for tests and checks

[karsten]

commit d4086dde65cb51ca1a39340b1b7a4e9d54981914
Author: Iain R. Learmonth 
Date:   Thu Sep 5 13:44:34 2019 +0100

Adds GitLab CI for tests and checks

Configuration is held in the .gitlab-ci.yml file.

Fixes: #31402
---
 .gitlab-ci.yml | 28 
 1 file changed, 28 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000..d10fcb8
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,28 @@
+variables:
+  GIT_STRATEGY: clone
+  METRICS_LIB_VERSION: "2.6.2"
+  EXONERATOR_VERSION: "4.1.0"
+  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
+
+stages:
+ - test
+
+test:
+ stage: test
+ image: debian:buster
+ script:
+  - apt update
+  - apt -y install default-jdk ant ivy git curl
+  - git submodule init
+  - git submodule update
+  - mkdir lib
+  - mkdir tmp
+  - pushd tmp
+  - curl 
https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz
 | tar xzf -
+  - curl 
https://dist.torproject.org/exonerator/$EXONERATOR_VERSION/exonerator-$EXONERATOR_VERSION.tar.gz
 | tar xzf -
+  - popd
+  - mv 
tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar
 lib
+  - mv 
tmp/exonerator-$EXONERATOR_VERSION/generated/dist/exonerator-$EXONERATOR_VERSION-thin.jar
 lib
+  - ant -lib /usr/share/java resolve
+  - ant test
+  - ant checks

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

[tor-commits] [lego/master] add sticky class for nav menus

[antonela]

commit efafbf5574417583f97edd0b0be3143a2cd1577b
Author: Antonela 
Date:   Thu Sep 5 09:18:14 2019 -0400

add sticky class for nav menus
---
 assests/scss/_tor.scss | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/assests/scss/_tor.scss b/assests/scss/_tor.scss
index ff6f69a..c73909d 100644
--- a/assests/scss/_tor.scss
+++ b/assests/scss/_tor.scss
@@ -645,6 +645,13 @@ table {
 display: none !important;
 }
 
+// Sticky menu
+.sticky {
+  position: sticky;
+  top: 105px;
+  z-index: 999;
+}
+
 // Small devices (landscape phones, less than 768px)
 @include media-breakpoint-down(sm) {
 .mobile {

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

[tor-commits] [tpo/master] Fix up RecommendedTBBVersions

[gk]

commit eeffd9f6baade154c898e5bb82a3e215ee3eb5d3
Author: Georg Koppen 
Date:   Thu Sep 5 13:10:44 2019 +

Fix up RecommendedTBBVersions
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index d8103db..b07f01a 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -12,7 +12,7 @@ body:
 "9.0a4",
 "9.0a4-MacOS",
 "9.0a4-Linux",
-"9.0a4-Windows"
+"9.0a4-Windows",
 "9.0a6",
 "9.0a6-MacOS",
 "9.0a6-Linux",

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

[tor-commits] [tpo/master] Rename download link to alpha builds

[emmapeel]

commit 5899127a786dfee507de927892b6a6efaf4fd4f7
Author: kjpark 
Date:   Wed Sep 4 01:25:42 2019 -0400

Rename download link to alpha builds
---
 templates/hero-download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/hero-download.html b/templates/hero-download.html
index 7c3744a..9cfb65a 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -43,7 +43,7 @@
 
 
   {{ _('Download in another language or 
platform') }}
-  {{ _('Advanced Install Options') }}
+  {{ _('Download the latest alpha build') 
}}
   {{ _('Download Tor Source Code') }}
 
 



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

[tor-commits] [tpo/master] Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds'

[emmapeel]

commit 929b9bf0b0dc48746085b5fa540189ae3bdd90aa
Merge: 9fb6fe2 5899127
Author: emma peel 
Date:   Thu Sep 5 14:45:31 2019 +0200

 Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds'
close: https://github.com/torproject/tpo/pull/49
fix: https://dip.torproject.org/web/tpo/issues/2
docshackathon ftw!

 templates/hero-download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/master] changes: file for 30967

[nickm]

commit 4b1d2ba9798b0255d9566a642dffd09467e321df
Author: teor 
Date:   Fri Aug 30 23:03:50 2019 +1000

changes: file for 30967
---
 changes/ticket30967 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/ticket30967 b/changes/ticket30967
new file mode 100644
index 0..5fe9c980b
--- /dev/null
+++ b/changes/ticket30967
@@ -0,0 +1,6 @@
+  o Testing:
+- When checking shell scripts, ignore any user-created directories.
+  Closes ticket 30967.
+  o Minor features (git scripts):
+- Call the shellcheck script from the pre-commit hook.
+  Closes ticket 30967.



___
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 'tor-github/pr/1278'

[nickm]

commit 2591440faa2671b52c290879bb3d426c6380
Merge: 9a402a654 4f762bc41
Author: Nick Mathewson 
Date:   Thu Sep 5 07:41:58 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1278'

 Makefile.am| 18 ++-
 changes/ticket30967|  6 
 scripts/git/pre-commit.git-hook|  4 +++
 scripts/maint/checkShellScripts.sh | 64 ++
 4 files changed, 76 insertions(+), 16 deletions(-)

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

[tor-commits] [tor/master] Makefile: Explicitly list the subdirectories that contain scripts

[nickm]

commit d14573a62371fd6d21ed801bc89e2f3ebdb98b2b
Author: teor 
Date:   Fri Aug 30 22:25:14 2019 +1000

Makefile: Explicitly list the subdirectories that contain scripts

Part of 30967.
---
 Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cc4305cb..25c6562c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,9 +239,10 @@ test: all
$(top_builddir)/src/test/test
 
 shellcheck:
-# Only use shellcheck if it is present
+   # Only use shellcheck if shellcheck is installed
+   # Check the directories that contain scripts that we can fix
if command -v shellcheck; then \
-find "$(top_srcdir)" -name "*.sh" -not -path 
"$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec 
shellcheck {} +; \
+find "$(top_srcdir)" -name "*.sh" -path 
"$(top_srcdir)/contrib/*" -path "$(top_srcdir)/doc/*" -path 
"$(top_srcdir)/scripts/*" -path "$(top_srcdir)/src/*" -not -path 
"$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec 
shellcheck {} +; \
if [ -d "$(top_srcdir)/scripts/test" ]; then \
 shellcheck $(top_srcdir)/scripts/test/cov-diff 
$(top_srcdir)/scripts/test/coverage; \
 fi; \



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

[tor-commits] [tor/master] shellcheck: Add shellcheck to the pre-commit hook

[nickm]

commit 5c2941e69f3e444664d6426f42cb52cb885800ee
Author: teor 
Date:   Fri Aug 30 22:54:05 2019 +1000

shellcheck: Add shellcheck to the pre-commit hook

* Move the shellcheck script from the Makefile to its own script file
* Reformat the shellcheck script so it's easier to read and modify
* Call the shellcheck script from the pre-commit hook

Fixes bug 30967; not in any released version of Tor.
---
 Makefile.am| 18 +--
 scripts/git/pre-commit.git-hook|  4 +++
 scripts/maint/checkShellScripts.sh | 64 ++
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 25c6562c1..4022995fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,23 +239,7 @@ test: all
$(top_builddir)/src/test/test
 
 shellcheck:
-   # Only use shellcheck if shellcheck is installed
-   # Check the directories that contain scripts that we can fix
-   if command -v shellcheck; then \
-find "$(top_srcdir)" -name "*.sh" -path 
"$(top_srcdir)/contrib/*" -path "$(top_srcdir)/doc/*" -path 
"$(top_srcdir)/scripts/*" -path "$(top_srcdir)/src/*" -not -path 
"$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec 
shellcheck {} +; \
-   if [ -d "$(top_srcdir)/scripts/test" ]; then \
-shellcheck $(top_srcdir)/scripts/test/cov-diff 
$(top_srcdir)/scripts/test/coverage; \
-fi; \
-if [ -e 
"$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert" ]; then \
-shellcheck 
"$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert"; \
-fi; \
-if [ -e "$(top_srcdir)/contrib/client-tools/torify" ]; then \
-shellcheck 
"$(top_srcdir)/contrib/client-tools/torify"; \
-fi; \
-if [ -d "$(top_srcdir)/scripts/git" ]; then \
-shellcheck $(top_srcdir)/scripts/git/*.git-hook; \
-fi; \
-   fi
+   $(top_srcdir)/scripts/maint/checkShellScripts.sh
 
 check-local: check-spaces check-changes check-includes check-best-practices 
shellcheck
 
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
index b2a1847a2..1c381ec60 100755
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@ -53,3 +53,7 @@ if [ -e "${PT_DIR}/practracker.py" ]; then
 fi
 fi
 fi
+
+if [ -e scripts/maint/checkShellScripts.sh ]; then
+scripts/maint/checkShellScripts.sh
+fi
diff --git a/scripts/maint/checkShellScripts.sh 
b/scripts/maint/checkShellScripts.sh
new file mode 100755
index 0..02d1275c4
--- /dev/null
+++ b/scripts/maint/checkShellScripts.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2019 The Tor Project, Inc.
+# See LICENSE for license information
+#
+# checkShellScripts.sh
+# 
+# If shellcheck is installed, check all the shell scripts that we can fix.
+
+set -e
+
+# Only run this script if shellcheck is installed
+# command echoes the path to shellcheck, which is a useful diagnostic log
+if ! command -v shellcheck; then
+printf "%s: Install shellcheck to check shell scripts.\\n" "$0"
+exit 0
+fi
+
+# Some platforms don't have realpath
+if command -v realpath ; then
+HERE=$(dirname "$(realpath "$0")")
+else
+HERE=$(dirname "$0")
+if [ ! -d "$HERE" ]; then
+HERE=$(dirname "$PWD/$0")
+fi
+fi
+TOPLEVEL=$(dirname "$(dirname "$HERE")")
+
+# Check we actually have a tor/src directory
+if [ ! -d "$TOPLEVEL/src" ]; then
+printf "Error: Couldn't find src directory in expected location: %s\\n" \
+"$TOPLEVEL/src"
+fi
+
+# Check *.sh scripts, but ignore the ones that we can't fix
+find "$TOPLEVEL" \
+-name "*.sh" \
+-path "$TOPLEVEL/contrib/*" \
+-path "$TOPLEVEL/doc/*" \
+-path "$TOPLEVEL/scripts/*" \
+-path "$TOPLEVEL/src/*" \
+-not -path "$TOPLEVEL/src/ext/*" \
+-not -path "$TOPLEVEL/src/rust/registry/*" \
+-exec shellcheck {} +
+
+# Check scripts that aren't named *.sh
+if [ -d "$TOPLEVEL/scripts/test" ]; then
+shellcheck \
+"$TOPLEVEL/scripts/test/cov-diff" \
+"$TOPLEVEL/scripts/test/coverage"
+fi
+if [ -e \
+"$TOPLEVEL/contrib/dirauth-tools/nagios-check-tor-authority-cert" \
+   ]; then
+shellcheck \
+"$TOPLEVEL/contrib/dirauth-tools/nagios-check-tor-authority-cert"
+fi
+if [ -e "$TOPLEVEL/contrib/client-tools/torify" ]; then
+shellcheck "$TOPLEVEL/contrib/client-tools/torify"
+fi
+if [ -d "$TOPLEVEL/scripts/git" ]; then
+shellcheck "$TOPLEVEL/scripts/git/"*.git-hook
+fi



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

[tor-commits] [tor/master] Makefile: include checkShellScripts.sh in EXTRA_DIST

[nickm]

commit 4f762bc41d534012e2eaf31e2357c1149053c9c8
Author: teor 
Date:   Fri Aug 30 23:52:03 2019 +1000

Makefile: include checkShellScripts.sh in EXTRA_DIST

Part of 30967.
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 4022995fb..a7d1cbe8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,6 +168,7 @@ EXTRA_DIST+= \
ReleaseNotes\
scripts/maint/checkIncludes.py  \
scripts/maint/checkSpace.pl \
+   scripts/maint/checkShellScripts.sh  \
scripts/maint/practracker/README\
scripts/maint/practracker/exceptions.txt\
scripts/maint/practracker/includes.py   \



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

[tor-commits] [tpo/master] Remove 8.5.4 from RecommendedTBBVersions

[boklm]

commit ca464183ecda2276533f350a4d7c2e4e49f36060
Author: Nicolas Vigier 
Date:   Thu Sep 5 12:27:45 2019 +0200

Remove 8.5.4 from RecommendedTBBVersions
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 
 1 file changed, 4 deletions(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index b839c40..1510ef1 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -5,10 +5,6 @@ _template: empty.html
 body:
 
 [
-"8.5.4",
-"8.5.4-MacOS",
-"8.5.4-Linux",
-"8.5.4-Windows",
 "8.5.5",
 "8.5.5-MacOS",
 "8.5.5-Linux",



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

[tor-commits] [tpo/master] Add new Tor Browser version: 9.0a6

[boklm]

commit 9fb6fe2a1fb05f4c1f16d998146e0228f9502745
Author: Nicolas Vigier 
Date:   Thu Sep 5 12:28:46 2019 +0200

Add new Tor Browser version: 9.0a6
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 
 databags/versions.ini  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index 1510ef1..d8103db 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -13,4 +13,8 @@ body:
 "9.0a4-MacOS",
 "9.0a4-Linux",
 "9.0a4-Windows"
+"9.0a6",
+"9.0a6-MacOS",
+"9.0a6-Linux",
+"9.0a6-Windows"
 ]
diff --git a/databags/versions.ini b/databags/versions.ini
index f0e5f77..3a9ee37 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -3,7 +3,7 @@ version = 8.5.5
 win32 = 0.4.1.5
 
 [torbrowser-alpha]
-version = 9.0a4
+version = 9.0a6
 
 [tor-stable]
 version = 0.4.1.5

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

[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed

[translation]

commit bd4810cd9dd4892aa1006fc17136ae12da0159a5
Author: Translation commit bot 
Date:   Thu Sep 5 07:54:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+tr.po | 47 +--
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 1f310549d..edc26008e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,8 +1,8 @@
 # Translators:
 # ilkeryus , 2019
+# Emma Peel, 2019
 # erinm, 2019
 # Kaya Zeren , 2019
-# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-03 12:45+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1230,6 +1230,9 @@ msgid ""
 "relay](https://community.torproject.org/relay/), or encouraging others to do"
 " so."
 msgstr ""
+"[Kendi aktarıcınızı işleterek](https://community.torproject.org/relay/) 
ya "
+"da başkalarını bu konuda yüreklendirerek ağ hızının artmasına 
katkıda "
+"bulunabilirsiniz."
 
 #: https//support.torproject.org/tbb/tbb-22/
 #: (content/tbb/tbb-22/contents+en.lrquestion.description)
@@ -1400,7 +1403,7 @@ msgstr "Tor Browser sisteminizden kolayca 
kaldırılabilir:"
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On Windows:"
-msgstr ""
+msgstr "Windows üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1408,6 +1411,8 @@ msgid ""
 "* Locate your Tor Browser folder or application. The default location is the"
 " Desktop."
 msgstr ""
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak 
Masaüstü"
+" klasörü kullanılır."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1422,7 +1427,7 @@ msgstr "* Çöp kutunuzu boşaltın."
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On macOS:"
-msgstr ""
+msgstr "macOS üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1430,16 +1435,18 @@ msgid ""
 "* Locate your Tor Browser application. The default location is the "
 "Applications folder."
 msgstr ""
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak "
+"Applications klasörü kullanılır."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Move the Tor Browser application to Trash."
-msgstr ""
+msgstr "* Tor Browser uygulamasını çöp kutusuna atın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Go to your `~/Library/Application Support/` folder."
-msgstr ""
+msgstr "* `~/Library/Application Support/` klasörüne gidin."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1447,6 +1454,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* yeni macOS sürümlerinde Library klasörünün gizli olduğunu unutmayın. 
Bu "
+"klasörü açmak için Finder içinde \"Git\" menüsünde \"Klasöre Git...\" 
"
+"seçeneğini kullanın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1454,12 +1464,16 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid ""
 "*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
+"*  Açılan pencereye \"~/Library/Application Support/\" yazıp Git üzerine "
+"tıklayın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1467,16 +1481,18 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Locate the TorBrowser-Data folder and move it to Trash."
-msgstr ""
+msgstr "* Tor Browser-Data klasörünü bulup çöp kutusuna atın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On Linux:"
-msgstr ""
+msgstr "Linux üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1485,11 +1501,14 @@ msgid ""
 "however the folder will be named \"tor-browser_en-US\" if you are running "
 "the English Tor Browser."
 msgstr ""
+"* Tor Br

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

[translation]

commit d3b288fe5c9ab80d2fcea7a24018d3b9568d118d
Author: Translation commit bot 
Date:   Thu Sep 5 07:54:02 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+tr.po | 46 +++---
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 67e1a45eb..edc26008e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,8 +1,8 @@
 # Translators:
 # ilkeryus , 2019
+# Emma Peel, 2019
 # erinm, 2019
 # Kaya Zeren , 2019
-# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-03 12:45+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1230,7 +1230,7 @@ msgid ""
 "relay](https://community.torproject.org/relay/), or encouraging others to do"
 " so."
 msgstr ""
-"[Kendi aktarıcınızı işleterek](https://community.torproject.org/relay/), 
ya "
+"[Kendi aktarıcınızı işleterek](https://community.torproject.org/relay/) 
ya "
 "da başkalarını bu konuda yüreklendirerek ağ hızının artmasına 
katkıda "
 "bulunabilirsiniz."
 
@@ -1403,7 +1403,7 @@ msgstr "Tor Browser sisteminizden kolayca 
kaldırılabilir:"
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On Windows:"
-msgstr ""
+msgstr "Windows üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1411,6 +1411,8 @@ msgid ""
 "* Locate your Tor Browser folder or application. The default location is the"
 " Desktop."
 msgstr ""
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak 
Masaüstü"
+" klasörü kullanılır."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1425,7 +1427,7 @@ msgstr "* Çöp kutunuzu boşaltın."
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On macOS:"
-msgstr ""
+msgstr "macOS üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1433,16 +1435,18 @@ msgid ""
 "* Locate your Tor Browser application. The default location is the "
 "Applications folder."
 msgstr ""
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak "
+"Applications klasörü kullanılır."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Move the Tor Browser application to Trash."
-msgstr ""
+msgstr "* Tor Browser uygulamasını çöp kutusuna atın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Go to your `~/Library/Application Support/` folder."
-msgstr ""
+msgstr "* `~/Library/Application Support/` klasörüne gidin."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1450,6 +1454,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* yeni macOS sürümlerinde Library klasörünün gizli olduğunu unutmayın. 
Bu "
+"klasörü açmak için Finder içinde \"Git\" menüsünde \"Klasöre Git...\" 
"
+"seçeneğini kullanın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1457,12 +1464,16 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid ""
 "*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
+"*  Açılan pencereye \"~/Library/Application Support/\" yazıp Git üzerine "
+"tıklayın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1470,16 +1481,18 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "* Locate the TorBrowser-Data folder and move it to Trash."
-msgstr ""
+msgstr "* Tor Browser-Data klasörünü bulup çöp kutusuna atın."
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
 msgid "On Linux:"
-msgstr ""
+msgstr "Linux üzerinde:"
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -1488,11 +1501,14 @@ msgid ""
 "however the folder will be named \"tor-browser_en-US\" if you are running "
 "the English Tor Browser."
 msgstr ""
+"* Tor Browser klasörünü bulun. Linux 

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up fix for #31598

[gk]

commit a327f24b9b730258da19c37e7d09ad52b7cc2e9f
Author: Georg Koppen 
Date:   Thu Sep 5 07:19:36 2019 +

Pick up fix for #31598
---
 toolkit/torproject/torbutton | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 0efb110e9bc6..1edfec57049a 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 0efb110e9bc65e3289c58d093c32a25877f61e0b
+Subproject commit 1edfec57049a76052fda8eb17b6e3b8f281e3361

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

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.

[gk]

commit f19b6946fcccb42b3b060c5ecf53ba8ec524b420
Author: Alex Catarineu 
Date:   Tue Sep 3 12:13:01 2019 +0200

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 31598: Enable letterboxing
---
 browser/app/profile/000-tor-browser.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 6c2d2476e1b3..81352dcbaece 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -161,6 +161,8 @@ pref("security.webauth.webauthn", false); // Bug 26614: 
Disable Web Authenticati
 pref("browser.cache.frecency_experiment", -1);
 // Bug 2874: Block Components.interfaces from content
 pref("dom.use_components_shim", false);
+// Enable letterboxing
+pref("privacy.resistFingerprinting.letterboxing", true);
 
 // Third party stuff
 pref("privacy.firstparty.isolate", true); // Always enforce first party 
isolation

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

[tor-commits] [chutney/master] Travis: test IPv6-only v3 single onion services on macOS tor stable

[teor]

commit 33cbff7fc73aa51a785197c5f4afa5a91d81de9c
Author: teor 
Date:   Mon Jun 10 20:31:35 2019 +1000

Travis: test IPv6-only v3 single onion services on macOS tor stable

Using networks/single-onion-v23-ipv6-md.

This test requires 0.4.1, which is available in macOS homebrew's
online package repository. (IPv6 v3 single onion services require
23588, which was merged into 0.4.1.1-alpha.)

The fix for 30928 updates homebrew in all the macOS jobs, so we
also get the latest tor version from homebrew.

Closes 30279.
---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac5ee75..9cb5e0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,9 +41,8 @@ matrix:
   os: osx
   language: c
   python:
-## v2 onion services only, see #30279 for v3 onion services
-## needs #23588 in macOS homebrew, once 0.4.1-stable is released
-- env: TOR="stable-release" NETWORK_FLAVOUR="single-onion-ipv6-md"
+## v3 onion service IPv6 tests
+- env: TOR="stable-release" NETWORK_FLAVOUR="single-onion-v23-ipv6-md"
   os: osx
   language: c
   python:

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

[tor-commits] [torbutton/master] Bug 31598: Disable warning on window resize if letterboxing is enabled

[gk]

commit 1edfec57049a76052fda8eb17b6e3b8f281e3361
Author: Alex Catarineu 
Date:   Wed Sep 4 11:38:45 2019 +0200

Bug 31598: Disable warning on window resize if letterboxing is enabled
---
 chrome/content/torbutton.js | 14 --
 defaults/preferences/preferences.js |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js
index 6209b6b8..9d6a5c48 100644
--- a/chrome/content/torbutton.js
+++ b/chrome/content/torbutton.js
@@ -92,6 +92,7 @@ var torbutton_unique_pref_observer =
 m_tb_prefs.addObserver("plugin.disable", this, false);
 m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false);
 m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false);
+m_tb_prefs.addObserver("privacy.resistFingerprinting.letterboxing", 
this, false);
 
 // We observe xpcom-category-entry-added for plugins w/ 
Gecko-Content-Viewers
 var observerService = Services.obs;
@@ -107,6 +108,7 @@ var torbutton_unique_pref_observer =
 m_tb_prefs.removeObserver("plugin.disable", this);
 m_tb_prefs.removeObserver("privacy.firstparty.isolate", this);
 m_tb_prefs.removeObserver("privacy.resistFingerprinting", this);
+m_tb_prefs.removeObserver("privacy.resistFingerprinting.letterboxing", 
this);
 
 var observerService = Services.obs;
 observerService.removeObserver(this, "xpcom-category-entry-added");
@@ -156,6 +158,7 @@ var torbutton_unique_pref_observer =
 torbutton_use_nontor_proxy();
 break;
 case "privacy.resistFingerprinting":
+case "privacy.resistFingerprinting.letterboxing":
 torbutton_update_fingerprinting_prefs();
 break;
 case "privacy.firstparty.isolate":
@@ -1508,14 +1511,14 @@ function torbutton_update_disk_prefs() {
 
 function torbutton_update_fingerprinting_prefs() {
 var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting");
+var letterboxing = 
m_tb_prefs.getBoolPref("privacy.resistFingerprinting.letterboxing", false);
 
 m_tb_prefs.setBoolPref("webgl.disable-extensions", mode);
 m_tb_prefs.setBoolPref("dom.network.enabled", !mode);
 m_tb_prefs.setBoolPref("dom.enable_performance", !mode);
 m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode);
 m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode);
-
-m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode);
+m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode && 
!letterboxing);
 
 // Force prefs to be synced to disk
 Services.prefs.savePrefFile(null);
@@ -1915,8 +1918,7 @@ function torbutton_new_window(event)
 let progress = Cc["@mozilla.org/docloaderservice;1"]
  .getService(Ci.nsIWebProgress);
 
-if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows")
-&& torbutton_is_windowed(window)) {
+if (torbutton_is_windowed(window)) {
   progress.addProgressListener(torbutton_resizelistener,
Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
 }
@@ -1999,8 +2001,8 @@ var torbutton_resizelistener =
 await new Promise(resolve => setTimeout(resolve, 0));
 if (window.windowState === window.STATE_MAXIMIZED ||
 window.windowState === window.STATE_FULLSCREEN) {
-  if (m_tb_prefs.
-  getIntPref("extensions.torbutton.maximize_warnings_remaining") > 
0) {
+  if 
(m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") &&
+  
m_tb_prefs.getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {
 
 // Do not add another notification if one is already showing.
 const kNotificationName = "torbutton-maximize-notification";
diff --git a/defaults/preferences/preferences.js 
b/defaults/preferences/preferences.js
index e5d66d55..acea0a3d 100644
--- a/defaults/preferences/preferences.js
+++ b/defaults/preferences/preferences.js
@@ -30,7 +30,7 @@ pref("extensions.torbutton.cookie_protections",true);
 pref("extensions.torbutton.cookie_auto_protect",false);
 pref("extensions.torbutton.clear_http_auth",true);
 pref("extensions.torbutton.close_newnym",true);
-pref("extensions.torbutton.resize_new_windows",true);
+pref("extensions.torbutton.resize_new_windows",false);
 pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last
 pref("extensions.torbutton.tor_memory_jar",false);
 pref("extensions.torbutton.nontor_memory_jar",false);

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