date:20211026

[tor-commits] [stem/master] Add timezone to parsed datetimes

2021-10-26 Thread atagar

commit f8717b4bffd46c8c0ee7147f5b50927737b2b5e1
Author: Steven Engler 
Date:   Mon Oct 25 14:46:39 2021 -0400

Add timezone to parsed datetimes
---
 stem/control.py |  3 ++-
 stem/descriptor/__init__.py |  3 ++-
 stem/descriptor/extrainfo_descriptor.py |  2 +-
 stem/descriptor/networkstatus.py|  2 +-
 stem/descriptor/router_status_entry.py  |  3 ++-
 stem/descriptor/tordnsel.py |  6 +++---
 stem/response/events.py |  8 +---
 stem/util/str_tools.py  | 15 +++
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/stem/control.py b/stem/control.py
index e162704b..40ca6bed 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -247,6 +247,7 @@ If you're fine with allowing your script to raise 
exceptions then this can be mo
 import asyncio
 import calendar
 import collections
+import datetime
 import functools
 import inspect
 import io
@@ -1537,7 +1538,7 @@ class Controller(BaseController):
   self.get_info('accounting/bytes-left'),
 )
 
-interval_end = stem.util.str_tools._parse_timestamp(interval_end)
+interval_end = stem.util.str_tools._parse_timestamp(interval_end, 
datetime.timezone.utc)
 used_read, used_written = [int(val) for val in used.split(' ', 1)]
 left_read, left_written = [int(val) for val in left.split(' ', 1)]
 
diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index c015d246..d928ff21 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -108,6 +108,7 @@ import base64
 import codecs
 import collections
 import copy
+import datetime
 import hashlib
 import io
 import os
@@ -683,7 +684,7 @@ def _parse_timestamp_line(keyword: str, attribute: str) -> 
Callable[['stem.descr
 value = _value(keyword, entries)
 
 try:
-  setattr(descriptor, attribute, 
stem.util.str_tools._parse_timestamp(value))
+  setattr(descriptor, attribute, 
stem.util.str_tools._parse_timestamp(value, datetime.timezone.utc))
 except ValueError:
   raise ValueError("Timestamp on %s line wasn't parsable: %s %s" % 
(keyword, keyword, value))
 
diff --git a/stem/descriptor/extrainfo_descriptor.py 
b/stem/descriptor/extrainfo_descriptor.py
index 8d9cbf30..ad08d361 100644
--- a/stem/descriptor/extrainfo_descriptor.py
+++ b/stem/descriptor/extrainfo_descriptor.py
@@ -239,7 +239,7 @@ def _parse_timestamp_and_interval(keyword: str, content: 
str) -> Tuple[datetime.
 raise ValueError("%s line's interval wasn't a number: %s" % (keyword, 
line))
 
   try:
-timestamp = stem.util.str_tools._parse_timestamp(timestamp_str)
+timestamp = stem.util.str_tools._parse_timestamp(timestamp_str, 
datetime.timezone.utc)
 return timestamp, int(interval), remainder
   except ValueError:
 raise ValueError("%s line's timestamp wasn't parsable: %s" % (keyword, 
line))
diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py
index e8cf90eb..a69f501f 100644
--- a/stem/descriptor/networkstatus.py
+++ b/stem/descriptor/networkstatus.py
@@ -1962,7 +1962,7 @@ class BridgeNetworkStatusDocument(NetworkStatusDocument):
   published_line = published_line.split(' ', 1)[1].strip()
 
   try:
-self.published = stem.util.str_tools._parse_timestamp(published_line)
+self.published = stem.util.str_tools._parse_timestamp(published_line, 
datetime.timezone.utc)
   except ValueError:
 if validate:
   raise ValueError("Bridge network status document's 'published' time 
wasn't parsable: %s" % published_line)
diff --git a/stem/descriptor/router_status_entry.py 
b/stem/descriptor/router_status_entry.py
index aa94a703..eed34fac 100644
--- a/stem/descriptor/router_status_entry.py
+++ b/stem/descriptor/router_status_entry.py
@@ -22,6 +22,7 @@ sources...
 """
 
 import binascii
+import datetime
 import io
 
 import stem.exit_policy
@@ -161,7 +162,7 @@ def _parse_r_line(descriptor: 'stem.descriptor.Descriptor', 
entries: ENTRY_TYPE)
 
   try:
 published = '%s %s' % (r_comp[3], r_comp[4])
-descriptor.published = stem.util.str_tools._parse_timestamp(published)
+descriptor.published = stem.util.str_tools._parse_timestamp(published, 
datetime.timezone.utc)
   except ValueError:
 raise ValueError("Publication time time wasn't parsable: r %s" % value)
 
diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py
index 32cf1863..ffb67578 100644
--- a/stem/descriptor/tordnsel.py
+++ b/stem/descriptor/tordnsel.py
@@ -98,13 +98,13 @@ class TorDNSEL(Descriptor):
 self.fingerprint = value
   elif keyword == 'Published':
 try:
-  self.published = stem.util.str_tools._parse_timestamp(value)
+  self.published = stem.util.str_tools._parse_timestamp(value, 
datetime.timezone.utc)
 except ValueError:
   if validate:
 raise ValueError("Published time wasn't parsable: %s" % value)
   elif keyword == 'LastStatus':

[tor-commits] [stem/master] Update to python 3.9

2021-10-26 Thread atagar

commit 56f3daa4c124dae3e050b76d531480f8e233cc59
Author: Linus Gasser 
Date:   Fri Oct 22 10:12:06 2021 +0200

Update to python 3.9

Closes #105

Since python 3.2: 
https://docs.python.org/3/library/stdtypes.html#int.from_bytes
---
 stem/descriptor/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 3f10bc57..c015d246 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -1051,7 +1051,7 @@ class Descriptor(object):
 try:
   from cryptography.hazmat.backends import default_backend
   from cryptography.hazmat.primitives.serialization import 
load_der_public_key
-  from cryptography.utils import int_to_bytes, int_from_bytes
+  from cryptography.utils import int_to_bytes
 except ImportError:
   raise ValueError('Generating the signed digest requires the cryptography 
module')
 
@@ -1060,7 +1060,7 @@ class Descriptor(object):
 public_exponent = key.public_numbers().e
 
 sig_as_bytes = _bytes_for_block(signature)
-sig_as_long = int_from_bytes(sig_as_bytes, byteorder='big')  # convert 
signature to an int
+sig_as_long = int.from_bytes(sig_as_bytes, byteorder='big')  # convert 
signature to an int
 blocksize = len(sig_as_bytes)  # 256B for NetworkStatusDocuments, 128B for 
others
 
 # use the public exponent[e] & the modulus[n] to decrypt the int

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

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

2021-10-26 Thread translation

commit 05ac2adaa3bf213a5bbcffe2ef189fe7da5cd099
Author: Translation commit bot 
Date:   Tue Oct 26 22:47:49 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+cs.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+cs.po b/contents+cs.po
index 72d1b1f984..5399cab59b 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -13,6 +13,7 @@
 # erinm, 2021
 # Lenka Å imeÄkovÃ¡ , 2021
 # Fourdee Foureight, 2021
+# Ascii Wolf , 2021
 # 
 msgid ""
 msgstr ""
@@ -20,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 15:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Fourdee Foureight, 2021\n"
+"Last-Translator: Ascii Wolf , 2021\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14325,7 +14326,7 @@ msgstr "ZavÅÃt baner"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Privacy is a human right"
-msgstr "SoukromÃ je lidksÃ© prÃ¡vo"
+msgstr "SoukromÃ je lidskÃ© prÃ¡vo"
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."

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

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

2021-10-26 Thread translation

commit 392d3064d4d27c86cc1fa49e0184403ee91d1d6f
Author: Translation commit bot 
Date:   Tue Oct 26 22:47:42 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-cs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-cs.md b/tor-outreach2019-2020-cs.md
index 8baac29af8..5c736e3ea0 100644
--- a/tor-outreach2019-2020-cs.md
+++ b/tor-outreach2019-2020-cs.md
@@ -2,7 +2,7 @@
 
 # 1. TOR FOR PRIVACY 
 
-### SoukromÃ je lidksÃ© prÃ¡vo
+### SoukromÃ je lidskÃ© prÃ¡vo
 
 Like many of us, Aleisha spends most of her time online--connecting with 
friends, posting on social media, and browsing the web.
 

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

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

2021-10-26 Thread translation

commit e13614b516760498f81e63b0bfe1cd6f49792296
Author: Translation commit bot 
Date:   Tue Oct 26 22:45:23 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
---
 contents+cs.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+cs.po b/contents+cs.po
index 578e2cd37c..9589c3ebb3 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -4,6 +4,7 @@
 # Michal Stanke , 2021
 # Ondrej FÃ¼hrer , 2021
 # Fourdee Foureight, 2021
+# Ascii Wolf , 2021
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: 2021-03-24 14:33+\n"
-"Last-Translator: Fourdee Foureight, 2021\n"
+"Last-Translator: Ascii Wolf , 2021\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +196,7 @@ msgstr "ZavÅÃt baner"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Privacy is a human right"
-msgstr "SoukromÃ je lidksÃ© prÃ¡vo"
+msgstr "SoukromÃ je lidskÃ© prÃ¡vo"
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."

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

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

2021-10-26 Thread translation

commit 65b4a56d38e4cb42fe788dde9b52aaa41bc145cf
Author: Translation commit bot 
Date:   Tue Oct 26 22:45:20 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
---
 cs/torbrowser_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cs/torbrowser_strings.xml b/cs/torbrowser_strings.xml
index 74da2b93a2..ec20779809 100644
--- a/cs/torbrowser_strings.xml
+++ b/cs/torbrowser_strings.xml
@@ -26,7 +26,7 @@
 AktuÃ¡lnÃ 
ÃºroveÅ zabezpeÄenÃ: %s
 OtevÅÃt 
nastavenÃ bezpeÄnosti
 PodpoÅte projekt Tor a 
udrÅ¾te ho v bezpeÄÃ
-Tor je zdarma k pouÅ¾itÃ 
dÃky darÅ¯m od lidÃ jako ty.
+Tor je zdarma k pouÅ¾itÃ 
dÃky darÅ¯m od lidÃ jako jste vy.
 PÅispÄjte
 
 ProhlÃÅ¾ejte v soukromÃ.

___
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

2021-10-26 Thread translation

commit 6eb04a2eda5cd248939249e845343007fc3c1ee4
Author: Translation commit bot 
Date:   Tue Oct 26 22:45:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 cs/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index 2d5dd753f5..0b7b586ac9 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
@@ -48,7 +48,7 @@
   Thank you!
 -->
 
-
+

[tor-commits] [tor/main] scripts: Add -M option to git-list-tor-branches.sh

2021-10-26 Thread dgoulet

commit 5e1f64602bd11fc24c72f0617c362aa7ab79f0d8
Author: David Goulet 
Date:   Tue Oct 26 15:52:51 2021 -0400

scripts: Add -M option to git-list-tor-branches.sh

Omit all "maint" branch. It is the opposite of -R that omits release
branches.

In other words, -M can be used to list all release branches.

Signed-off-by: David Goulet 
---
 scripts/git/git-list-tor-branches.sh | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/git/git-list-tor-branches.sh 
b/scripts/git/git-list-tor-branches.sh
index 62547dcc5d..29e91dd1b6 100755
--- a/scripts/git/git-list-tor-branches.sh
+++ b/scripts/git/git-list-tor-branches.sh
@@ -8,7 +8,7 @@ SCRIPT_NAME=$(basename "$0")
 
 function usage()
 {
-echo "$SCRIPT_NAME [-h] [-l|-s|-b|-m] [-R]"
+echo "$SCRIPT_NAME [-h] [-l|-s|-b|-m] [-R|-M]"
 echo
 echo "  arguments:"
 echo "   -h: show this help text"
@@ -20,6 +20,7 @@ function usage()
 echo "   ( branch parent path suffix parent_suffix ) arrays"
 echo
 echo "   -R: omit release branches."
+echo "   -M: omit maint branches."
 }
 
 # list : just a list of branch names.
@@ -27,9 +28,10 @@ function usage()
 # suffix: write a list of suffixes.
 # merge: branch, upstream, path, suffix, upstream suffix.
 mode="list"
+skip_maint_branches="no"
 skip_release_branches="no"
 
-while getopts "hblmsR" opt ; do
+while getopts "hblmsRM" opt ; do
 case "$opt" in
 h) usage
exit 0
@@ -42,6 +44,8 @@ while getopts "hblmsR" opt ; do
;;
 m) mode="merge"
;;
+M) skip_maint_branches="yes"
+   ;;
 R) skip_release_branches="yes"
;;
 *) echo "Unknown option"
@@ -80,6 +84,9 @@ branch() {
 suffix="_${brname_nodots#maint-}"
 location="\$GIT_PATH/\$TOR_WKT_NAME/$brname"
 is_maint="yes"
+if [[ "$skip_maint_branches" = "yes" ]]; then
+return
+fi
 elif [[ "$brname" =~ ^release- ]]; then
 suffix="_r${brname_nodots#release-}"
 location="\$GIT_PATH/\$TOR_WKT_NAME/$brname"

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

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6

2021-10-26 Thread dgoulet

commit 549e5cf90cf777d32975c9049f93bb8c5cc3acb2
Merge: ccdf9a3e35 61aed5200c
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

 scripts/ci/ci-driver.sh | 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/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit 61aed5200c89ebafb2db6330a52f9c34d674f294
Merge: 90a74a2ea8 ae92a92453
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 scripts/ci/ci-driver.sh | 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/release-0.4.6] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

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

2021-10-26 Thread dgoulet

commit 19b6196f675c4ba743f08a703751b802229545a7
Merge: 4deffa907e ae92a92453
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

 scripts/ci/ci-driver.sh | 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/release-0.3.5] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

[tor-commits] [tor/release-0.4.5] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

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

2021-10-26 Thread dgoulet

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2021-10-26 Thread dgoulet

commit e51b25c02d44b8ff7f6b84951e0cd90cc100589c
Merge: e33c6717b8 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:48 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 scripts/ci/ci-driver.sh | 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/maint-0.4.6] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit 61aed5200c89ebafb2db6330a52f9c34d674f294
Merge: 90a74a2ea8 ae92a92453
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 scripts/ci/ci-driver.sh | 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/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/maint-0.4.5] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-26 Thread dgoulet

commit 304bd31d494e1dd4066b1238db8a9909f0652726
Merge: 3e61a9c8a5 61aed5200c
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.6'

 scripts/ci/ci-driver.sh | 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/main] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.



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

[tor-commits] [tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit 61aed5200c89ebafb2db6330a52f9c34d674f294
Merge: 90a74a2ea8 ae92a92453
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 scripts/ci/ci-driver.sh | 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/maint-0.3.5] ci: Missing source dir when parsing configure.ac version

2021-10-26 Thread dgoulet

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9
Author: David Goulet 
Date:   Tue Oct 26 14:33:31 2021 -0400

ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 67a95a1f61..f99e45e6f2 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; 
s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.

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

[tor-commits] [snowflake/main] Turn the proxy code into a library

2021-10-26 Thread cohosh

commit 50e4f4fd61596bab254cb34e850c9ae63d82f891
Author: idk 
Date:   Mon Oct 25 22:51:40 2021 -0400

Turn the proxy code into a library

Allow other go programs to easily import the snowflake proxy library and
start/stop a snowflake proxy.
---
 proxy/{ => lib}/proxy-go_test.go |   8 +-
 proxy/{ => lib}/snowflake.go | 205 ++-
 proxy/{ => lib}/tokens.go|   2 +-
 proxy/{ => lib}/tokens_test.go   |   2 +-
 proxy/{ => lib}/util.go  |  18 +++-
 proxy/{ => lib}/webrtcconn.go|   2 +-
 proxy/main.go|  48 +
 7 files changed, 185 insertions(+), 100 deletions(-)

diff --git a/proxy/proxy-go_test.go b/proxy/lib/proxy-go_test.go
similarity index 98%
rename from proxy/proxy-go_test.go
rename to proxy/lib/proxy-go_test.go
index 6fb5a0b9..af71648 100644
--- a/proxy/proxy-go_test.go
+++ b/proxy/lib/proxy-go_test.go
@@ -1,4 +1,4 @@
-package main
+package snowflake
 
 import (
"bytes"
@@ -365,7 +365,7 @@ func TestBrokerInteractions(t *testing.T) {
b,
}
 
-   sdp := broker.pollOffer(sampleOffer)
+   sdp := broker.pollOffer(sampleOffer, nil)
expectedSDP, _ := strconv.Unquote(sampleSDP)
So(sdp.SDP, ShouldResemble, expectedSDP)
})
@@ -379,7 +379,7 @@ func TestBrokerInteractions(t *testing.T) {
b,
}
 
-   sdp := broker.pollOffer(sampleOffer)
+   sdp := broker.pollOffer(sampleOffer, nil)
So(sdp, ShouldBeNil)
})
Convey("sends answer to broker", func() {
@@ -478,7 +478,7 @@ func TestUtilityFuncs(t *testing.T) {
Convey("CopyLoop", t, func() {
c1, s1 := net.Pipe()
c2, s2 := net.Pipe()
-   go CopyLoop(s1, s2)
+   go copyLoop(s1, s2, nil)
go func() {
bytes := []byte("Hello!")
c1.Write(bytes)
diff --git a/proxy/snowflake.go b/proxy/lib/snowflake.go
similarity index 72%
rename from proxy/snowflake.go
rename to proxy/lib/snowflake.go
index 7d7f9a2..e35eabd 100644
--- a/proxy/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -1,10 +1,9 @@
-package main
+package snowflake
 
 import (
"bytes"
"crypto/rand"
"encoding/base64"
-   "flag"
"fmt"
"io"
"io/ioutil"
@@ -12,27 +11,44 @@ import (
"net"
"net/http"
"net/url"
-   "os"
"strings"
"sync"
"time"
 
"git.torproject.org/pluggable-transports/snowflake.git/common/messages"
-   "git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
"git.torproject.org/pluggable-transports/snowflake.git/common/util"

"git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn"
"github.com/gorilla/websocket"
"github.com/pion/webrtc/v3"
 )
 
-const defaultBrokerURL = "https://snowflake-broker.torproject.net/;
-const defaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
-const defaultRelayURL = "wss://snowflake.torproject.net/"
-const defaultSTUNURL = "stun:stun.stunprotocol.org:3478"
+// DefaultBrokerURL is the bamsoftware.com broker, 
https://snowflake-broker.bamsoftware.com
+// Changing this will change the default broker. The recommended way of 
changing
+// the broker that gets used is by passing an argument to Main.
+const DefaultBrokerURL = "https://snowflake-broker.bamsoftware.com/;
+
+// DefaultProbeURL is the torproject.org  ProbeURL, 
https://snowflake-broker.torproject.net:8443/probe
+// Changing this will change the default Probe URL. The recommended way of 
changing
+// the probe that gets used is by passing an argument to Main.
+const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
+
+// DefaultRelayURL is the bamsoftware.com  Websocket Relay, 
wss://snowflake.bamsoftware.com/
+// Changing this will change the default Relay URL. The recommended way of 
changing
+// the relay that gets used is by passing an argument to Main.
+const DefaultRelayURL = "wss://snowflake.bamsoftware.com/"
+
+// DefaultSTUNURL is a stunprotocol.org STUN URL. 
stun:stun.stunprotocol.org:3478
+// Changing this will change the default STUN URL. The recommended way of 
changing
+// the STUN Server that gets used is by passing an argument to Main.
+const DefaultSTUNURL = "stun:stun.stunprotocol.org:3478"
 const pollInterval = 5 * time.Second
+
 const (
-   NATUnknown  = "unknown"
-   NATRestricted   = "restricted"
+   // NATUnknown represents a NAT type which is unknown.
+   NATUnknown = "unknown"
+   // NATRestricted represents a restricted NAT.
+   NATRestricted = "restricted"
+   // NATUnrestricted represents an unrestricted NAT.

[tor-commits] [community/translations] update translation file

2021-10-26 Thread emmapeel

commit 191ff713db4ab516013af48e3705726589a1d0d4
Author: emma peel 
Date:   Tue Oct 26 18:54:53 2021 +0200

update translation file
---
 i18n/contents.pot | 1233 -
 1 file changed, 831 insertions(+), 402 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index ec8d99a..f19547e 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-21 11:36+CET\n"
+"POT-Creation-Date: 2021-10-26 18:39+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -3617,6 +3617,8 @@ msgstr ""
 #: (content/relay/setup/bridge/openbsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/netbsd/
 #: (content/relay/setup/guard/netbsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/debian-ubuntu/
+#: (content/relay/setup/guard/debian-ubuntu/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/dragonflybsd/
@@ -3629,8 +3631,12 @@ msgstr ""
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/
 #: (content/relay/setup/guard/freebsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/centos-rhel/
+#: (content/relay/setup/guard/centos-rhel/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/debian-ubuntu/updates/
+#: (content/relay/setup/guard/debian-ubuntu/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/updates/
 #: (content/relay/setup/guard/centosrhel/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/fedora/updates/
@@ -3639,6 +3645,8 @@ msgstr ""
 #: (content/relay/setup/guard/debianubuntu/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/updates/
 #: (content/relay/setup/guard/freebsd/updates/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/centos-rhel/updates/
+#: (content/relay/setup/guard/centos-rhel/updates/contents+en.lr:page.body)
 msgid "```"
 msgstr ""
 
@@ -6327,8 +6335,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "Nickname myNiceRelay"
@@ -6340,8 +6346,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ExitRelay 0"
@@ -6372,12 +6376,8 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/dragonflybsd/
-#: (content/relay/setup/guard/dragonflybsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ContactInfo tor-operator@your-emailaddress-domain"
@@ -6421,8 +6421,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 msgid "ORPort 9001"
 msgstr ""
 
@@ -6440,15 +6438,11 @@ msgstr ""
 
 #: https://community.torproject.org/training/resources/tor-relay-workshop/
 #:

[tor-commits] [community/translations] update lego

2021-10-26 Thread emmapeel

commit adedc12894be656aa5be7cef94bc5932a9ab9c90
Author: emma peel 
Date:   Tue Oct 26 18:54:40 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 8bbc491..bc96ee5 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20
+Subproject commit bc96ee58985e63529559653e14b42430ad972c10



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

[tor-commits] [community/translations] update contents

2021-10-26 Thread emmapeel

commit d6d0fc9480ec0ece73ad8989d648f19c1d6d3007
Author: emma peel 
Date:   Tue Oct 26 18:54:31 2021 +0200

update contents
---
 .../community-resources/good-bad-isps/contents.lr  | 11 ++-
 content/relay/setup/guard/centos-rhel/contents.lr  | 95 ++
 .../setup/guard/centos-rhel/updates/contents.lr| 94 +
 .../relay/setup/guard/debian-ubuntu/contents.lr| 62 ++
 .../setup/guard/debian-ubuntu/updates/contents.lr  | 63 ++
 content/relay/setup/guard/dragonflybsd/contents.lr | 61 +++---
 content/relay/setup/guard/fedora/contents.lr   | 35 
 content/relay/setup/guard/freebsd/contents.lr  | 53 ++--
 content/relay/setup/guard/netbsd/contents.lr   | 38 ++---
 content/relay/setup/guard/openbsd/contents.lr  | 61 --
 content/relay/setup/post-install/contents.lr   |  1 +
 templates/home.html|  2 +-
 templates/homepage.html|  4 +-
 templates/localization.html|  4 +-
 templates/two-columns-page.html|  4 +-
 templates/user-research.html   |  2 +-
 16 files changed, 468 insertions(+), 122 deletions(-)

diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index 455bc47..98026f7 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -21,6 +21,8 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
  * Hetzner Online GmbH (AS24940)
  * DigitalOcean, LLC (AS14061)
 
+These hosts already have many tor nodes being hosted there.
+
 **Note**: This page is currently being revamped. If you would like to help out 
please see [#72](https://gitlab.torproject.org/tpo/web/community/-/issues/72).
 
 # Good Experiences
@@ -68,7 +70,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-|-|-|--|-|-||
 | [Online.net](http://www.online.net/) | AS12876 | Yes | Yes | Yes | The 
account holder is responsible for all the traffic going through theirs 
servers.| 01/28/2019 |
 | [Gandi VPS](https://www.gandi.net/) | - | Yes | Yes | Yes| Gandi send some 
abuse complaints to Exit relays, but they do not stop the server, and when you 
tell them your server is a Tor Exit relay, they say it is OK. They ask Exit 
relays to use the standard Reduced Exit Policy | - |
-| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. 
Running a Tor exit node is strictly forbidden and can lead to the suspension 
and even termination of your server and account." | 09/27/2021 |
+| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. 
Running a Tor exit node is strictly forbidden and can lead to the suspension 
and even termination of your server and account." Locations: FR,CA | 09/27/2021 
|
 | [Digicube](http://www.digicube.fr/) | - | Yes | Yes | Yes | - | - |
 | [Pulse Servers](http://www.pulseservers.com/) | AS16276 | Yes | Yes | Yes | 
VPS uses OVH AS. You can build ANY kind tor relays. | 09/27/2021 |
 
@@ -96,7 +98,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - 
| 2018-10-25 |
 | [linevast](https://www.linevast.de) | AS201206 | No | No | No |  | 03/2021 |
 | [Server4You](https://www.server4you.de)| AS131914 | No | No | No | - | 
03/2021 |
-| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. Unmetered bandwidth on dedicated 
servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to 
a server lock" | 09/27/2021 |
+| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. Unmetered bandwidth on dedicated 
servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to 
a server lock" Locations: DE,FI | 09/27/2021 |
 | [Contabo](https://contabo.de) | AS51167 | No | No | No | Tor prohibited due 
to terms of service | 03/2021 |
 | [Strato](https://strato.de) | AS6724 | No | No | No | - | 03/2021 |
 | [PraHost](https://www.prahost.com) | - | Yes | Yes | Yes | "If there is any 
abuse notice received, you need to solve it in given time, else your IP will be 
blocked until you take any action" | 03/2021 |
@@ -313,9 +315,10 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [HostHatch](https://hosthatch.com) | AS46562 | Yes | Yes | No | Their vps 
isp are mixed include: QuadraNet,

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

2021-10-26 Thread translation

commit 7f95d8cf3492a562f2cb0154b03a232e7939a660
Author: Translation commit bot 
Date:   Tue Oct 26 16:19:08 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+tr.po | 367 ++--
 contents.pot   | 398 +
 2 files changed, 409 insertions(+), 356 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index e9b9716d3f..fd2e99ab4e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-21 10:31+CET\n"
+"POT-Creation-Date: 2021-10-26 15:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Kaya Zeren , 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
@@ -25,6 +25,13 @@ msgstr ""
 msgid "How can we help?"
 msgstr "NasÄ±l yardÄ±mcÄ± olabiliriz?"
 
+#: https//support.torproject.org/glossary/
+#: (content/glossary/contents+en.lrglossary.title)
+#: https//support.torproject.org/misc/menu/
+#: (content/misc/menu/contents+en.lrquestion.description)
+msgid "Glossary"
+msgstr "Terimler SÃ¶zlÃ¼ÄÃ¼"
+
 #: https//support.torproject.org/faq/ (content/faq/contents+en.lrtopic.title)
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
@@ -4980,9 +4987,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org"
+"âª# gpg --auto-key-locate nodefault,wkd --locate-keys "
+"torbrow...@torproject.org"
 msgstr ""
-"gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -5235,16 +5242,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
-#: https//support.torproject.org/little-t-tor/verify-little-t-tor/
-#: 
(content/little-t-tor/verify-little-t-tor/contents+en.lrquestion.description)
 msgid ""
-"curl -s https://openpgpkey.torproject.org/.well-;
+"âª# curl -s https://openpgpkey.torproject.org/.well-;
 "known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg "
 "--import -"
 msgstr ""
-"curl -s https://openpgpkey.torproject.org/.well-;
-"known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg "
-"--import -"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -5274,9 +5276,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"`$ gpg --keyserver keys.openpgp.org --search-keys torbrow...@torproject.org`"
+"âª`$ gpg --keyserver keys.openpgp.org --search-keys "
+"torbrow...@torproject.org`"
 msgstr ""
-"`$ gpg --keyserver keys.openpgp.org --search-keys torbrow...@torproject.org`"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -5978,8 +5980,8 @@ msgstr ""
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
-msgid "`./start-tor-browser.desktop --verbose`"
-msgstr "`./start-tor-browser.desktop --verbose`"
+msgid "âª`./start-tor-browser.desktop --verbose`"
+msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -5994,8 +5996,8 @@ msgstr ""
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
-msgid "`./start-tor-browser.desktop --log [file]`"
-msgstr "`./start-tor-browser.desktop --log [file]`"
+msgid "âª`./start-tor-browser.desktop --log [file]`"
+msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-22/
 #: (content/tbb/tbb-22/contents+en.lrquestion.title)
@@ -9452,12 +9454,9 @@ msgstr ""
 #: https//support.torproject.org/relay-operators/behind-nat/
 #: (content/relay-operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"Forwarding TCP connections is system dependent but the firewalled-clients "
-"FAQ entry offers some examples on how to do this."
+"Forwarding TCP connections is system dependent but the [firewalled-clients "
+"FAQ](/tbb/tbb-firewall-ports/) entry offers some examples on how to do this."
 msgstr ""
-"TCP baÄlantÄ±larÄ±nÄ±n nasÄ±l yÃ¶nlendirileceÄi kullanÄ±lan sisteme gÃ¶re 
deÄiÅir "
-"ancak

[tor-commits] [community/master] update lego

2021-10-26 Thread emmapeel

commit 7734ee62d821578ed9ea7e349aa589f8373286e6
Author: emma peel 
Date:   Tue Oct 26 18:02:43 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c8ed9e1..bc96ee5 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c8ed9e1d9cd895cdfb1a9b18822310b40cc93f58
+Subproject commit bc96ee58985e63529559653e14b42430ad972c10

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

[tor-commits] [community/master] replace section with path to prevent translation. closes https://gitlab.torproject.org/tpo/web/community/-/issues/234

2021-10-26 Thread emmapeel

commit 325ac819df7962feeca9d542aca0525c9d199410
Author: emma peel 
Date:   Wed Oct 20 21:22:13 2021 +0200

replace section with path to prevent translation. closes 
https://gitlab.torproject.org/tpo/web/community/-/issues/234
---
 templates/home.html | 2 +-
 templates/localization.html | 4 ++--
 templates/two-columns-page.html | 4 ++--
 templates/user-research.html| 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/home.html b/templates/home.html
index b81314c..f95a873 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -14,7 +14,7 @@
 {{ _(child.title) }}
 {{ _(child.subtitle) }}
 
-  
+  
 
   
   {{ 
_(child.cta) }}
diff --git a/templates/localization.html b/templates/localization.html
index 7a17aba..1d0056b 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   
@@ -29,7 +29,7 @@
   {{ _('Localization is a continuous process across our applications. 
Notice any improvements we could make to our translations? Open a ticket, reach 
out to us, or become part of our translators squad.') }}
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n;>
-  {{ _('Translators mailing list') }}
+  {{ _('Join Tor Translators mailing list') }}
 
   
 
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index d71e970..0f48cfd 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -25,9 +25,9 @@
 
 
   
-
+
 
-  {{ _("Back to previous page: ") }}{{ 
this.parent.title }} - https://github.com/torproject/community/edit/master/content{{ this.path 
}}/contents.lr">{{ _("Edit this page") }}
+  {{ _("Back to previous page: ") }} 
{{ this.parent.title }} - https://github.com/torproject/community/edit/master/content{{ this.path 
}}/contents.lr">{{ _("Edit this page") }}
 
   
 
diff --git a/templates/user-research.html b/templates/user-research.html
index 339cca3..903831a 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   

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

[tor-commits] [tpo/master] Bump Tor versions to 0.4.6.8 and 0.4.7.2-alpha.

2021-10-26 Thread gus

commit b11ea9faf3dd3fefa530c6f23c5be6348ef85399
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Oct 26 15:28:38 2021 +

Bump Tor versions to 0.4.6.8 and 0.4.7.2-alpha.
---
 databags/versions.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 23a4f5e1..304c72fe 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -21,8 +21,8 @@ version = 11.0a8
 version = 11.0a9
 
 [tor-stable]
-version = 0.4.6.7
+version = 0.4.6.8
 
 [tor-alpha]
-version = 0.4.7.1-alpha
+version = 0.4.7.2-alpha
 

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

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/release-0.4.6] version: Bump to 0.4.5.11-dev

2021-10-26 Thread dgoulet

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504
Author: David Goulet 
Date:   Tue Oct 26 11:31:06 2021 -0400

version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6bc86ddce7..c602d2c5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.11])
+AC_INIT([tor],[0.4.5.11-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/release-0.4.6] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

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

2021-10-26 Thread dgoulet

commit ccdf9a3e35c68fff24728e6a5f6d140c91564710
Merge: d5efc2c986 90a74a2ea8
Author: David Goulet 
Date:   Tue Oct 26 11:31:45 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

 configure.ac | 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/release-0.4.6] version: Bump to 0.4.6.8-dev

2021-10-26 Thread dgoulet

commit d672cc6e47324108f777b4e01e0fff3fb8603130
Author: David Goulet 
Date:   Tue Oct 26 11:31:24 2021 -0400

version: Bump to 0.4.6.8-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 43f9f475db..387ad11ffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.8])
+AC_INIT([tor],[0.4.6.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

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

2021-10-26 Thread dgoulet

commit 90a74a2ea82edba1beacd9e84291b128f82116a8
Merge: d672cc6e47 d4af7bdb26
Author: David Goulet 
Date:   Tue Oct 26 11:31:28 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

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

2021-10-26 Thread dgoulet

commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

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

2021-10-26 Thread dgoulet

commit 4deffa907e85d2162288c9022e3b221373533ffa
Merge: 2b1742b075 d4af7bdb26
Author: David Goulet 
Date:   Tue Oct 26 11:31:45 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

 configure.ac | 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/release-0.4.5] version: Bump to 0.4.5.11-dev

2021-10-26 Thread dgoulet

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504
Author: David Goulet 
Date:   Tue Oct 26 11:31:06 2021 -0400

version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6bc86ddce7..c602d2c5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.11])
+AC_INIT([tor],[0.4.5.11-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/release-0.4.5] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/release-0.3.5] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit 90a74a2ea82edba1beacd9e84291b128f82116a8
Merge: d672cc6e47 d4af7bdb26
Author: David Goulet 
Date:   Tue Oct 26 11:31:28 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

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

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

2021-10-26 Thread dgoulet

commit e33c6717b8a453485d5813bcf61ec68a79d06035
Merge: df6e03a092 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:45 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 configure.ac | 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/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.4.5.11-dev

2021-10-26 Thread dgoulet

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504
Author: David Goulet 
Date:   Tue Oct 26 11:31:06 2021 -0400

version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6bc86ddce7..c602d2c5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.11])
+AC_INIT([tor],[0.4.5.11-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.4.6.8-dev

2021-10-26 Thread dgoulet

commit d672cc6e47324108f777b4e01e0fff3fb8603130
Author: David Goulet 
Date:   Tue Oct 26 11:31:24 2021 -0400

version: Bump to 0.4.6.8-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 43f9f475db..387ad11ffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.8])
+AC_INIT([tor],[0.4.6.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

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

[tor-commits] [tor/maint-0.4.5] version: Bump to 0.4.5.11-dev

2021-10-26 Thread dgoulet

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504
Author: David Goulet 
Date:   Tue Oct 26 11:31:06 2021 -0400

version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6bc86ddce7..c602d2c5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.11])
+AC_INIT([tor],[0.4.5.11-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.4.5] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-26 Thread dgoulet

commit 3e61a9c8a5c92fcfc57f969e995aa25e4e36c493
Merge: 4f1b9923b2 90a74a2ea8
Author: David Goulet 
Date:   Tue Oct 26 11:31:41 2021 -0400

Merge branch 'maint-0.4.6'

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

[tor-commits] [tor/main] version: Bump to 0.4.7.2-alpha-dev

2021-10-26 Thread dgoulet

commit 4f1b9923b2c8dbb48866182af35c40e9f3f065ec
Author: David Goulet 
Date:   Tue Oct 26 11:31:38 2021 -0400

version: Bump to 0.4.7.2-alpha-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6a9bee1658..17ac739b74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.7.2-alpha])
+AC_INIT([tor],[0.4.7.2-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/maint-0.3.5] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 

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

[tor-commits] [tor/main] version: Bump to 0.4.5.11-dev

2021-10-26 Thread dgoulet

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504
Author: David Goulet 
Date:   Tue Oct 26 11:31:06 2021 -0400

version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6bc86ddce7..c602d2c5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.11])
+AC_INIT([tor],[0.4.5.11-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/main] version: Bump to 0.4.6.8-dev

2021-10-26 Thread dgoulet

commit d672cc6e47324108f777b4e01e0fff3fb8603130
Author: David Goulet 
Date:   Tue Oct 26 11:31:24 2021 -0400

version: Bump to 0.4.6.8-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 43f9f475db..387ad11ffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.8])
+AC_INIT([tor],[0.4.6.8-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/main] version: Bump to 0.3.5.17-dev

2021-10-26 Thread dgoulet

commit 66193ee7084510e292b9a45da37812da3e04c46b
Author: David Goulet 
Date:   Tue Oct 26 11:30:56 2021 -0400

version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 855eb6441a..930862442c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17])
+AC_INIT([tor],[0.3.5.17-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



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

[tor-commits] [tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit 90a74a2ea82edba1beacd9e84291b128f82116a8
Merge: d672cc6e47 d4af7bdb26
Author: David Goulet 
Date:   Tue Oct 26 11:31:28 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

[tor-commits] [fallback-scripts/main] Update code to the latest arti

2021-10-26 Thread dgoulet

commit 2575c46bcd6983b8eea7a199f23de30197dd4329
Author: David Goulet 
Date:   Tue Oct 26 10:59:06 2021 -0400

Update code to the latest arti

Signed-off-by: David Goulet 
---
 Cargo.toml | 11 ---
 src/main.rs| 96 --
 src/onionoo.rs |  1 -
 3 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f4077d2..d711781 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,18 +6,19 @@ edition = "2018"
 
 # See more keys and their definitions at 
https://doc.rust-lang.org/cargo/reference/manifest.html
 
-#[features]
-#tokio = [ "tor-client/tokio", "tor-rtcompat/tokio" ]
+[features]
+default = [ "tokio" ]
+tokio = [ "tor-rtcompat/tokio" ]
 
 [dependencies]
 anyhow = "1.0.38"
 chrono = "0.4"
 rand = "0.8.3"
 reqwest = { version = "0.11", features = ["json"] }
-serde = { version = "1.0.124", features = ["derive"] }
-tokio = { version = "1", features = ["full"] }
+serde = { version = "1", features = ["derive"] }
+tokio-crate = { package = "tokio", version = "1.7.0", features = ["rt", 
"rt-multi-thread", "io-util", "net", "time", "macros" ] }
 
-tor-client = { git = "https://gitlab.torproject.org/tpo/core/arti.git;, 
features = ["experimental-api"]}
+arti-client = { git = "https://gitlab.torproject.org/tpo/core/arti.git;, 
features = ["experimental-api"]}
 tor-dirmgr = { git = "https://gitlab.torproject.org/tpo/core/arti.git; }
 tor-netdir = { git = "https://gitlab.torproject.org/tpo/core/arti.git;, 
features = ["experimental-api"] }
 tor-netdoc = { git = "https://gitlab.torproject.org/tpo/core/arti.git; }
diff --git a/src/main.rs b/src/main.rs
index c1802c2..52d1e8c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,19 +3,18 @@ use chrono::Utc;
 use rand::seq::SliceRandom;
 use std::fs::File;
 use std::io::{BufWriter, Write};
-use std::sync::Arc;
+use tokio_crate as tokio;
+use tor_rtcompat::tokio::TokioRuntimeHandle;
 
-use tor_client;
-use tor_dirmgr;
+use arti_client::{self, TorClientConfig};
 use tor_netdir;
-use tor_netdoc::doc::netstatus::RouterFlags;
+use tor_netdoc::doc::netstatus::RelayFlags;
 
 mod onionoo;
 
 // Header format from dir-list-spec.txt but static so Stem is happy about it. 
In the future, we
 // want to stop doing that.
-static HEADER_COMMENT: &'static str =
-"/* type=fallback */
+static HEADER_COMMENT: &'static str = "/* type=fallback */
 /* version=4.0.0 */
 /* timestamp=2021041200 */
 /* source=offer-list */";
@@ -64,7 +63,8 @@ fn write_file_tor_arti(writer:  BufWriter<>, relay: 
_netdir::Relay)
 writeln!(writer, "&[")?;
 writeln!(
 writer,
-"{: <12}{}", "",
+"{: <12}{}",
+"",
 relay
 .rs()
 .orport_addrs()
@@ -93,57 +93,55 @@ fn write_header_to_file(writer:  BufWriter<>) -> 
Result<()> {
 Ok(())
 }
 
-fn main() -> Result<()> {
-let mut builder = tor_dirmgr::NetDirConfigBuilder::new();
-builder.use_default_cache_path()?;
-let config: tor_dirmgr::NetDirConfig = builder.finalize()?;
+#[tokio::main]
+async fn main() -> Result<()> {
+let config = TorClientConfig::sane_defaults()?;
+let rt: TokioRuntimeHandle = 
tokio_crate::runtime::Handle::current().into();
 
 println!("[+] Fetching onionoo relays...");
-let onionoo_relays_fprs = onionoo::get_relay_fprs_from_onionoo()?;
-
-tor_rtcompat::task::block_on(async {
-println!("[+] Bootstrapping to the Tor network...");
-let tor_client = 
Arc::new(tor_client::TorClient::bootstrap(config).await?);
-let netdir = tor_client.dirmgr().netdir();
-
-println!("[+] Cross-referencing relays between Onionoo and Tor 
consensus...");
-
-let relays: Vec<_> = netdir
-.relays()
-.filter(|r| {
-r.is_dir_cache()
-&& r.rs().flags().contains(RouterFlags::FAST)
-&& r.rs().flags().contains(RouterFlags::STABLE)
-&& 
onionoo_relays_fprs.contains(_id().to_string().to_uppercase())
-})
-.collect();
+let onionoo_relays_fprs = onionoo::get_relay_fprs_from_onionoo().await?;
+
+println!("[+] Bootstrapping to the Tor network...");
+let arti_client = arti_client::TorClient::bootstrap(rt, config).await?;
+let netdir = arti_client.dirmgr().netdir();
+
+println!("[+] Cross-referencing relays between Onionoo and Tor 
consensus...");
+
+let relays: Vec<_> = netdir
+.relays()
+.filter(|r| {
+r.is_dir_cache()
+&& r.rs().flags().contains(RelayFlags::FAST)
+&& r.rs().flags().contains(RelayFlags::STABLE)
+&& 
onionoo_relays_fprs.contains(_id().to_string().to_uppercase())
+})
+.collect();
 
-println!("Got {} relays. Randomly sampling 200...", relays.len());
+println!("Got {} relays. Randomly sampling 200...", relays.len());
 
-let picks = relays.choose_multiple(

[tor-commits] [tpo/master] i #228: Remove some people from about/people

2021-10-26 Thread gus

commit aeae5dbc8eb6f743ef04fd1dc386bea9906bafe4
Author: HackerNCoder 
Date:   Sat Oct 23 18:28:32 2021 +

i #228: Remove some people from about/people
---
 content/about/people/amoghbl1/contents.lr | 17 -
 content/about/people/moritz/contents.lr   | 17 -
 content/about/people/sisbell/contents.lr  | 17 -
 content/about/people/stephw/contents.lr   | 21 -
 4 files changed, 72 deletions(-)

diff --git a/content/about/people/amoghbl1/contents.lr 
b/content/about/people/amoghbl1/contents.lr
deleted file mode 100644
index 2a32fafa..
--- a/content/about/people/amoghbl1/contents.lr
+++ /dev/null
@@ -1,17 +0,0 @@
-_model: person

-_hidden: yes

-role:core

-name: Amogh Pradeep

-twitter_handle: amoghbl1

-nickname: amoghbl1

-image: /static/images/people/amoghbl1.png

-description:
-
-[Lead developer](http://amoghbl1.com/) of Orfox and contributor to Orbot
diff --git a/content/about/people/moritz/contents.lr 
b/content/about/people/moritz/contents.lr
deleted file mode 100644
index 79d4fb7e..
--- a/content/about/people/moritz/contents.lr
+++ /dev/null
@@ -1,17 +0,0 @@
-_model: person

-_hidden: yes

-role:core

-name: Moritz Bartl

-gpg: /static/keys/moritz.txt

-image: /static/images/people/moritz.png

-twitter_handle: gamamb

-description:
-
-Co-founder of [torservers.net](https://www.torservers.net/), a network of 
non-profit organizations that run Tor exit relays.
diff --git a/content/about/people/sisbell/contents.lr 
b/content/about/people/sisbell/contents.lr
deleted file mode 100644
index 2f95fd97..
--- a/content/about/people/sisbell/contents.lr
+++ /dev/null
@@ -1,17 +0,0 @@
-_model: person

-_hidden: yes

-role:core

-name: Shane Isbell

-nickname: sisbell

-pronoun: he

-twitter_handle: sisbell

-description:
-
-Works on Tor Browser for Android.
diff --git a/content/about/people/stephw/contents.lr 
b/content/about/people/stephw/contents.lr
deleted file mode 100644
index cae06da6..
--- a/content/about/people/stephw/contents.lr
+++ /dev/null
@@ -1,21 +0,0 @@
-_model: person

-_hidden: yes

-role:core

-name: Stephanie Whited

-nickname: stephw

-pronoun: she

-twitter_handle: walnutwordsalad

-gpg: /static/keys/stephw.txt

-image: /static/images/people/stephw.png

-description:
-
-Directs communications.



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

[tor-commits] [tpo/master] Merge branch 'update-tor-people'

2021-10-26 Thread gus

commit ff1e65b1c2eca602d0f197fce83e111ad35acfdd
Merge: 850c1342 aeae5dbc
Author: gus 
Date:   Tue Oct 26 11:29:04 2021 -0300

Merge branch 'update-tor-people'

 content/about/people/amoghbl1/contents.lr | 17 -
 content/about/people/moritz/contents.lr   | 17 -
 content/about/people/sisbell/contents.lr  | 17 -
 content/about/people/stephw/contents.lr   | 21 -
 4 files changed, 72 deletions(-)

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

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

2021-10-26 Thread dgoulet

commit fadb57e853d5f3960e67e27092350b4047acacd7
Merge: a647c26a6b 6f776001cb
Author: David Goulet 
Date:   Tue Oct 26 09:17:58 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

[tor-commits] [tor/release-0.4.6] version: Bump to 0.4.6.8

2021-10-26 Thread dgoulet

commit a647c26a6bfa27a68f228deac022247655364f1e
Author: David Goulet 
Date:   Tue Oct 26 09:17:01 2021 -0400

version: Bump to 0.4.6.8

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1a5a7a7003..43f9f475db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.7-dev])
+AC_INIT([tor],[0.4.6.8])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.6.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 3dd470100f..c59769cdb8 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.7"
+!define VERSION "0.4.6.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index cc70a3ab19..ac4a8e31b2 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.7"
+#define VERSION "0.4.6.8"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

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

2021-10-26 Thread dgoulet

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

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

2021-10-26 Thread dgoulet

commit 2b1742b0759982a70c022481d7aeafeed818d8d4
Merge: 2504bce7c3 6f776001cb
Author: David Goulet 
Date:   Tue Oct 26 09:18:08 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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

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

[tor-commits] [tor/release-0.4.6] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/release-0.4.6] version: Bump to 0.4.5.11

2021-10-26 Thread dgoulet

commit 446135aff0b38df7e21a0484380f45d52436c36e
Author: David Goulet 
Date:   Tue Oct 26 09:16:44 2021 -0400

version: Bump to 0.4.5.11

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0102304fd2..6bc86ddce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.11])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fe25571c77..afcea51596 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.10"
+!define VERSION "0.4.5.11"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a2ebca9eb6..5b8c9a635e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.10"
+#define VERSION "0.4.5.11"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

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

2021-10-26 Thread dgoulet

commit d5efc2c98619568e0af2790a30c462a26fd8bae7
Merge: 2ae7a71f43 fadb57e853
Author: David Goulet 
Date:   Tue Oct 26 09:18:08 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

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

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

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit fadb57e853d5f3960e67e27092350b4047acacd7
Merge: a647c26a6b 6f776001cb
Author: David Goulet 
Date:   Tue Oct 26 09:17:58 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

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

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

2021-10-26 Thread dgoulet

commit df6e03a09268d5996295dd61cbee3e4845395c6e
Merge: 08e4b8d2fc 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:18:08 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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

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

[tor-commits] [tor/release-0.3.5] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/release-0.4.5] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/release-0.4.5] version: Bump to 0.4.5.11

2021-10-26 Thread dgoulet

commit 446135aff0b38df7e21a0484380f45d52436c36e
Author: David Goulet 
Date:   Tue Oct 26 09:16:44 2021 -0400

version: Bump to 0.4.5.11

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0102304fd2..6bc86ddce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.11])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fe25571c77..afcea51596 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.10"
+!define VERSION "0.4.5.11"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a2ebca9eb6..5b8c9a635e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.10"
+#define VERSION "0.4.5.11"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.4.6.8

2021-10-26 Thread dgoulet

commit a647c26a6bfa27a68f228deac022247655364f1e
Author: David Goulet 
Date:   Tue Oct 26 09:17:01 2021 -0400

version: Bump to 0.4.6.8

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1a5a7a7003..43f9f475db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.7-dev])
+AC_INIT([tor],[0.4.6.8])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.6.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 3dd470100f..c59769cdb8 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.7"
+!define VERSION "0.4.6.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index cc70a3ab19..ac4a8e31b2 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.7"
+#define VERSION "0.4.6.8"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/maint-0.4.5] version: Bump to 0.4.5.11

2021-10-26 Thread dgoulet

commit 446135aff0b38df7e21a0484380f45d52436c36e
Author: David Goulet 
Date:   Tue Oct 26 09:16:44 2021 -0400

version: Bump to 0.4.5.11

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0102304fd2..6bc86ddce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.11])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fe25571c77..afcea51596 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.10"
+!define VERSION "0.4.5.11"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a2ebca9eb6..5b8c9a635e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.10"
+#define VERSION "0.4.5.11"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/maint-0.4.6] version: Bump to 0.4.5.11

2021-10-26 Thread dgoulet

commit 446135aff0b38df7e21a0484380f45d52436c36e
Author: David Goulet 
Date:   Tue Oct 26 09:16:44 2021 -0400

version: Bump to 0.4.5.11

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0102304fd2..6bc86ddce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.11])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fe25571c77..afcea51596 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.10"
+!define VERSION "0.4.5.11"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a2ebca9eb6..5b8c9a635e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.10"
+#define VERSION "0.4.5.11"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/maint-0.4.5] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/maint-0.3.5] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 

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

[tor-commits] [tor/main] version: Bump to 0.4.7.2-alpha

2021-10-26 Thread dgoulet

commit 4e921f5b8856af5cfcd41a9e16753697539d4b9e
Author: David Goulet 
Date:   Tue Oct 26 09:23:35 2021 -0400

version: Bump to 0.4.7.2-alpha

Signed-off-by: David Goulet 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 85b23f24f9..6a9bee1658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.7.1-alpha])
+AC_INIT([tor],[0.4.7.2-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 

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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-26 Thread dgoulet

commit f31e4050db4e322e6bb1357fec794b323705f23b
Merge: 172d510794 fadb57e853
Author: David Goulet 
Date:   Tue Oct 26 09:18:05 2021 -0400

Merge branch 'maint-0.4.6'




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

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

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

[tor-commits] [tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/main] version: Bump to 0.4.6.8

2021-10-26 Thread dgoulet

commit a647c26a6bfa27a68f228deac022247655364f1e
Author: David Goulet 
Date:   Tue Oct 26 09:17:01 2021 -0400

version: Bump to 0.4.6.8

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1a5a7a7003..43f9f475db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.7-dev])
+AC_INIT([tor],[0.4.6.8])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.6.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 3dd470100f..c59769cdb8 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.7"
+!define VERSION "0.4.6.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index cc70a3ab19..ac4a8e31b2 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.7"
+#define VERSION "0.4.6.8"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/main] version: Bump to 0.3.5.17

2021-10-26 Thread dgoulet

commit 9280f32fc0e4ab61b6cd06a640d285188f845106
Author: David Goulet 
Date:   Tue Oct 26 09:16:13 2021 -0400

version: Bump to 0.3.5.17

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

diff --git a/configure.ac b/configure.ac
index e698bf8901..855eb6441a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.16-dev])
+AC_INIT([tor],[0.3.5.17])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c8695bc86c..7a6566a2c3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.16"
+!define VERSION "0.3.5.17"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 273806fde3..f32c725b07 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.16"
+#define VERSION "0.3.5.17"
 
 
 



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

[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-26 Thread dgoulet

commit fadb57e853d5f3960e67e27092350b4047acacd7
Merge: a647c26a6b 6f776001cb
Author: David Goulet 
Date:   Tue Oct 26 09:17:58 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

[tor-commits] [tor/main] version: Bump to 0.4.5.11

2021-10-26 Thread dgoulet

commit 446135aff0b38df7e21a0484380f45d52436c36e
Author: David Goulet 
Date:   Tue Oct 26 09:16:44 2021 -0400

version: Bump to 0.4.5.11

Signed-off-by: David Goulet 
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0102304fd2..6bc86ddce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.11])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fe25571c77..afcea51596 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.10"
+!define VERSION "0.4.5.11"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a2ebca9eb6..5b8c9a635e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.10"
+#define VERSION "0.4.5.11"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

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

2021-10-26 Thread translation

commit 23f9dedf91447c870ecd1e44eb7b71d61f4c9fbf
Author: Translation commit bot 
Date:   Tue Oct 26 09:47:08 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+tr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index f2372dee75..0a5dbae858 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -2162,7 +2162,7 @@ msgid ""
 "disable or partially disable certain browser features to protect against "
 "possible attacks."
 msgstr ""
-"Tor Browser GÃ¼venlik DÃ¼zeyi AyarÄ± yÃ¼kseltildiÄinde olasÄ± saldÄ±rÄ±lara 
karÅÄ± "
+"Tor Browser gÃ¼venlik dÃ¼zeyi ayarÄ± yÃ¼kseltildiÄinde olasÄ± saldÄ±rÄ±lara 
karÅÄ± "
 "koruma saÄlamak iÃ§in belirli tarayÄ±cÄ± Ã¶zellikleri tamamen ya da kÄ±smen 
devre"
 " dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."
 
@@ -4297,9 +4297,9 @@ msgid ""
 "understanding."
 msgstr ""
 "ÃzgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik saÄlama ve kiÅisel gizliliÄi koruma "
-"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼kleri geliÅtirmek, 
bu "
-"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ile bilimsel 
ve "
-"yaygÄ±n olarak anlaÅÄ±lmasÄ±nÄ± saÄlamak."
+"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerini ilerletmek, 
bu "
+"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ve hem 
bilimsel "
+"alanda hem de halk tarafÄ±ndan anlaÅÄ±lÄ±rlÄ±ÄÄ±nÄ± artÄ±rmak."
 
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20

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

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

2021-10-26 Thread translation

commit bb81bff3198893e39b40816385127067a4034e41
Author: Translation commit bot 
Date:   Tue Oct 26 09:47:04 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+tr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index f2372dee75..0a5dbae858 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -2162,7 +2162,7 @@ msgid ""
 "disable or partially disable certain browser features to protect against "
 "possible attacks."
 msgstr ""
-"Tor Browser GÃ¼venlik DÃ¼zeyi AyarÄ± yÃ¼kseltildiÄinde olasÄ± saldÄ±rÄ±lara 
karÅÄ± "
+"Tor Browser gÃ¼venlik dÃ¼zeyi ayarÄ± yÃ¼kseltildiÄinde olasÄ± saldÄ±rÄ±lara 
karÅÄ± "
 "koruma saÄlamak iÃ§in belirli tarayÄ±cÄ± Ã¶zellikleri tamamen ya da kÄ±smen 
devre"
 " dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."
 
@@ -4297,9 +4297,9 @@ msgid ""
 "understanding."
 msgstr ""
 "ÃzgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik saÄlama ve kiÅisel gizliliÄi koruma "
-"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼kleri geliÅtirmek, 
bu "
-"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ile bilimsel 
ve "
-"yaygÄ±n olarak anlaÅÄ±lmasÄ±nÄ± saÄlamak."
+"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerini ilerletmek, 
bu "
+"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ve hem 
bilimsel "
+"alanda hem de halk tarafÄ±ndan anlaÅÄ±lÄ±rlÄ±ÄÄ±nÄ± artÄ±rmak."
 
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20

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

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

2021-10-26 Thread translation

commit 9cec9924ec3443100fe07eba24eec7765e3712c3
Author: Translation commit bot 
Date:   Tue Oct 26 09:45:31 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
---
 contents+tr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 6b583fcdaf..1985b138a9 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -267,9 +267,9 @@ msgid ""
 "understanding."
 msgstr ""
 "ÃzgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik saÄlama ve kiÅisel gizliliÄi koruma "
-"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼kleri geliÅtirmek, 
bu "
-"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ile bilimsel 
ve "
-"yaygÄ±n olarak anlaÅÄ±lmasÄ±nÄ± saÄlamak."
+"teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerini ilerletmek, 
bu "
+"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ve hem 
bilimsel "
+"alanda hem de halk tarafÄ±ndan anlaÅÄ±lÄ±rlÄ±ÄÄ±nÄ± artÄ±rmak."
 
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20

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

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

2021-10-26 Thread translation

commit 438aecb62ae49c941f24d850bd5f05734e75e698
Author: Translation commit bot 
Date:   Tue Oct 26 09:45:16 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
---
 contents+tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+tr.po b/contents+tr.po
index 965760013c..ac1b31ae7e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5029,7 +5029,7 @@ msgid ""
 "by fewer people around the world, but it is still critical that we improve "
 "access to Tor for people who do not speak English."
 msgstr ""
-"BirÃ§ok dilin Ã§evirisi eksiktir. BazÄ± diller DÃ¼nya genelinde daha az kiÅi 
"
+"BirÃ§ok dildeki Ã§eviriler eksiktir. BazÄ± diller DÃ¼nya genelinde daha az 
kiÅi "
 "tarafÄ±ndan konuÅuluyor olabilir. Gene de Ä°ngilizce bilmeyen kiÅilerin Tor 
"
 "uygulamasÄ±na daha kolay eriÅmesini saÄlamak Ã§ok Ã¶nemlidir."
 

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

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

2021-10-26 Thread translation

commit 8e49b4bf1418f3be693ff54d7d7d044f81f4595c
Author: Translation commit bot 
Date:   Tue Oct 26 09:45:11 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+tr.po b/contents+tr.po
index 965760013c..ac1b31ae7e 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5029,7 +5029,7 @@ msgid ""
 "by fewer people around the world, but it is still critical that we improve "
 "access to Tor for people who do not speak English."
 msgstr ""
-"BirÃ§ok dilin Ã§evirisi eksiktir. BazÄ± diller DÃ¼nya genelinde daha az kiÅi 
"
+"BirÃ§ok dildeki Ã§eviriler eksiktir. BazÄ± diller DÃ¼nya genelinde daha az 
kiÅi "
 "tarafÄ±ndan konuÅuluyor olabilir. Gene de Ä°ngilizce bilmeyen kiÅilerin Tor 
"
 "uygulamasÄ±na daha kolay eriÅmesini saÄlamak Ã§ok Ã¶nemlidir."
 

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

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

2021-10-26 Thread translation

commit 4de039b5681bb3a5c2522a5fd276b58a2bb98954
Author: Translation commit bot 
Date:   Tue Oct 26 09:18:37 2021 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 5b04beb3d4..e9b9716d3f 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -17856,8 +17856,8 @@ msgid ""
 msgstr ""
 "ÃzgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik saÄlama ve kiÅisel gizliliÄi koruma "
 "teknolojileri geliÅtirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerini ilerletmek, 
bu "
-"teknolojilerin herhangi bir kÄ±sÄ±tlama olmadan eriÅilebilmesini ve bilimsel 
"
-"ve yaygÄ±n olarak anlaÅÄ±lmasÄ±nÄ± saÄlamak."
+"teknolojilere kÄ±sÄ±tlamasÄ±z olarak eriÅilebilmesini saÄlamak ve hem 
bilimsel "
+"alanda hem de halk tarafÄ±ndan anlaÅÄ±lÄ±rlÄ±ÄÄ±nÄ± artÄ±rmak."
 
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20

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

1 2 >

1 - 100 of 106 matches

Mail list logo