]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoDoxygen: fix unbalanced groups.
Nick Mathewson [Tue, 19 May 2020 13:18:39 +0000 (09:18 -0400)] 
Doxygen: fix unbalanced groups.

Closes ticket 34255.

5 years agoAdd a changes file for 34233.
Nick Mathewson [Fri, 15 May 2020 14:27:49 +0000 (10:27 -0400)] 
Add a changes file for 34233.

This bug was merged back to 0.3.5 with our #34078 fix, but only
released in 0.4.3.5, so the changes file goes here.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 15 May 2020 14:25:27 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 15 May 2020 14:25:27 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1 maint-0.4.1
Nick Mathewson [Fri, 15 May 2020 14:25:27 +0000 (10:25 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoFix use of non-portable == in configure.ac.
Nick Mathewson [Fri, 15 May 2020 13:58:49 +0000 (09:58 -0400)] 
Fix use of non-portable == in configure.ac.

Fixes bug 34233.

(This has bug has been backported to 0.3.5, but only released in
0.4.3, so it only needs a changes file there.)

5 years agobump to 0.4.3.5-dev
Nick Mathewson [Fri, 15 May 2020 13:02:12 +0000 (09:02 -0400)] 
bump to 0.4.3.5-dev

5 years agobump to 0.4.3.5
Nick Mathewson [Thu, 14 May 2020 14:37:42 +0000 (10:37 -0400)] 
bump to 0.4.3.5

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Thu, 14 May 2020 14:20:08 +0000 (10:20 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Thu, 14 May 2020 14:20:08 +0000 (10:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 14 May 2020 14:20:08 +0000 (10:20 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoTravis: temporarily fix stem version to d1174a83c2dcb7b8
Nick Mathewson [Wed, 13 May 2020 12:53:02 +0000 (08:53 -0400)] 
Travis: temporarily fix stem version to d1174a83c2dcb7b8

This is a workaround for https://github.com/torproject/stem/issues/63

5 years agoFix a boolean logic error when logging about invalid hostnames.
Nick Mathewson [Wed, 6 May 2020 21:15:37 +0000 (17:15 -0400)] 
Fix a boolean logic error when logging about invalid hostnames.

Fixes bug 34131; bugfix on 0.4.3.1-alpha.

5 years agoconnection_or_finished_flushing(): add a missing "break;"
Nick Mathewson [Wed, 6 May 2020 21:09:27 +0000 (17:09 -0400)] 
connection_or_finished_flushing(): add a missing "break;"

This one is harmless like the others (so far)

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 6 May 2020 21:07:47 +0000 (17:07 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 21:07:27 +0000 (17:07 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agobtrack_orconn_cevent.c: Add a missing "break;"
Nick Mathewson [Wed, 6 May 2020 21:07:12 +0000 (17:07 -0400)] 
btrack_orconn_cevent.c: Add a missing "break;"

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 6 May 2020 20:58:12 +0000 (16:58 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:58:12 +0000 (16:58 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:58:12 +0000 (16:58 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agochanges file for bug 34078.
Nick Mathewson [Wed, 6 May 2020 20:58:06 +0000 (16:58 -0400)] 
changes file for bug 34078.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.3 version.)

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 6 May 2020 20:54:12 +0000 (16:54 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.2 version.)

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:53:06 +0000 (16:53 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.1 version.)

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:51:33 +0000 (16:51 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

5 years agohs_dos.c: rewrite a comment not to say "fallthrough"
Nick Mathewson [Wed, 6 May 2020 20:49:57 +0000 (16:49 -0400)] 
hs_dos.c: rewrite a comment not to say "fallthrough"

There's nothing wrong with the comment, but the script I'm about to
apply wouldn't like it.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:47:03 +0000 (16:47 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:47:03 +0000 (16:47 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 6 May 2020 20:47:03 +0000 (16:47 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'bug34078_prelim_041' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:46:52 +0000 (16:46 -0400)] 
Merge branch 'bug34078_prelim_041' into maint-0.4.1

5 years agoMerge branch 'bug34078_prelim_035' into maint-0.3.5
Nick Mathewson [Wed, 6 May 2020 20:46:31 +0000 (16:46 -0400)] 
Merge branch 'bug34078_prelim_035' into maint-0.3.5

5 years agoMerge branch 'bug34078_prelim_035' into bug34078_prelim_041
Nick Mathewson [Wed, 6 May 2020 19:18:36 +0000 (15:18 -0400)] 
Merge branch 'bug34078_prelim_035' into bug34078_prelim_041

5 years agoRemove an incorrect "Fall through" comment.
Nick Mathewson [Wed, 6 May 2020 18:47:38 +0000 (14:47 -0400)] 
Remove an incorrect "Fall through" comment.

5 years agoaddress.c: add a single (harmless) missing break;
Nick Mathewson [Wed, 6 May 2020 14:42:17 +0000 (10:42 -0400)] 
address.c: add a single (harmless) missing break;

5 years agoinclude compat_compiler for ed25519_donna
Nick Mathewson [Wed, 6 May 2020 14:38:59 +0000 (10:38 -0400)] 
include compat_compiler for ed25519_donna

5 years agoReplace some "fall through" comments not at the end of a case.
Nick Mathewson [Wed, 6 May 2020 14:35:36 +0000 (10:35 -0400)] 
Replace some "fall through" comments not at the end of a case.

5 years agoReplace a "fall through" comment that was outside a switch.
Nick Mathewson [Wed, 6 May 2020 14:32:35 +0000 (10:32 -0400)] 
Replace a "fall through" comment that was outside a switch.

5 years agoAdd a fallthrough macro.
Nick Mathewson [Wed, 6 May 2020 14:24:21 +0000 (10:24 -0400)] 
Add a fallthrough macro.

This macro defers to __attribute__((fallthrough)) on GCC (and
clang).  Previously we had been using GCC's magic /* fallthrough */
comments, but clang very sensibly doesn't accept those.

Since not all compiler recognize it, we only define it when our
configure script detects that it works.

Part of a fix for 34078.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Mon, 4 May 2020 14:25:52 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Mon, 4 May 2020 14:25:52 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'bug34077_043' into maint-0.4.3
Nick Mathewson [Mon, 4 May 2020 14:25:45 +0000 (10:25 -0400)] 
Merge branch 'bug34077_043' into maint-0.4.3

5 years agoMerge branch 'bug34077_041' into maint-0.4.1
Nick Mathewson [Mon, 4 May 2020 14:14:38 +0000 (10:14 -0400)] 
Merge branch 'bug34077_041' into maint-0.4.1

5 years agoFix a GCC 10.0.1 compilation error.
Nick Mathewson [Fri, 1 May 2020 03:04:56 +0000 (23:04 -0400)] 
Fix a GCC 10.0.1 compilation error.

Do not try to stuff "HS_DESC_DECODE_GENERIC_ERROR" (-1) into a
socks5_reply_status_t (enum).  It doesn't actually make sense, and
isn't one of our documented extensions.

(This can only happen on a nonfatal assertion that we haven't seen,
so it probably isn't happening in practice.)

Fixes another case of bug 34077; bugfix on 0.4.3.1-alpha.

5 years agoMerge branch 'bug34077_042' into bug34077_043
Nick Mathewson [Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)] 
Merge branch 'bug34077_042' into bug34077_043

5 years agoMerge branch 'bug34077_041' into bug34077_042
Nick Mathewson [Fri, 1 May 2020 02:59:08 +0000 (22:59 -0400)] 
Merge branch 'bug34077_041' into bug34077_042

5 years agoFix a GCC 10.0.1 compilation warning.
Nick Mathewson [Fri, 1 May 2020 02:56:31 +0000 (22:56 -0400)] 
Fix a GCC 10.0.1 compilation warning.

Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
first gives this warning for 9eeff921ae7b786d960ea4286d5bba56)

5 years agochanneltls: Stop truncating IPv6 in logs
teor [Wed, 15 Apr 2020 03:06:01 +0000 (13:06 +1000)] 
channeltls: Stop truncating IPv6 in logs

Stop truncating IPv6 addresses and ports in channel and connection logs.

Fixes bug 33918; bugfix on 0.2.4.4-alpha.

5 years agobump to 0.4.3.4-rc-dev
Nick Mathewson [Mon, 13 Apr 2020 21:02:20 +0000 (17:02 -0400)] 
bump to 0.4.3.4-rc-dev

5 years agoMerge branch 'bug33545_043_squashed' into maint-0.4.3
Nick Mathewson [Mon, 13 Apr 2020 18:13:44 +0000 (14:13 -0400)] 
Merge branch 'bug33545_043_squashed' into maint-0.4.3

5 years agohs-v3: Change all-zeroes hard-assert to a BUG-and-err.
George Kadianakis [Mon, 30 Mar 2020 13:33:30 +0000 (16:33 +0300)] 
hs-v3: Change all-zeroes hard-assert to a BUG-and-err.

And also disallow all-zeroes keys from the filesystem; add a test for it too.

5 years agohs-v3: Don't allow registration of an all-zeroes client auth key.
George Kadianakis [Mon, 30 Mar 2020 13:09:52 +0000 (16:09 +0300)] 
hs-v3: Don't allow registration of an all-zeroes client auth key.

The client auth protocol allows attacker-controlled x25519 private keys being
passed around, which allows an attacker to potentially trigger the all-zeroes
assert for client_auth_sk in hs_descriptor.c:decrypt_descriptor_cookie().

We fixed that by making sure that an all-zeroes client auth key will not be
used.

There are no guidelines for validating x25519 private keys, and the assert was
there as a sanity check for code flow issues (we don't want to enter that
function with an unitialized key if client auth is being used). To avoid such
crashes in the future, we also changed the assert to a BUG-and-err.

5 years agobump to 0.4.3.4-rc
Nick Mathewson [Thu, 9 Apr 2020 12:38:41 +0000 (08:38 -0400)] 
bump to 0.4.3.4-rc

5 years agoAdd fsync to list of syscalls permitted by sandbox
Nick Mathewson [Thu, 9 Apr 2020 12:33:11 +0000 (08:33 -0400)] 
Add fsync to list of syscalls permitted by sandbox

(Our fix for 33087 requires this, I believe.)

5 years agoMerge remote-tracking branch 'tor-github/pr/1723/head' into maint-0.4.3
Nick Mathewson [Thu, 9 Apr 2020 12:30:14 +0000 (08:30 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1723/head' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
teor [Thu, 9 Apr 2020 09:41:19 +0000 (19:41 +1000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

Remove check-best-practices from check-local in maint-0.4.3.
(The check-local jobs are all on separate lines in 0.4.3.)

5 years agoremove practracker from check-local (0.4.2 and 0.4.3 only)
Nick Mathewson [Wed, 19 Jun 2019 18:29:08 +0000 (14:29 -0400)] 
remove practracker from check-local (0.4.2 and 0.4.3 only)

practracker shouldn't be running in release or maint branches.

5 years agoMerge branch 'pr1854_squashed' into maint-0.4.3
teor [Thu, 9 Apr 2020 01:05:59 +0000 (11:05 +1000)] 
Merge branch 'pr1854_squashed' into maint-0.4.3

Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).

5 years agoclient: Revert setting PreferIPv6 on by default
David Goulet [Tue, 7 Apr 2020 13:04:01 +0000 (09:04 -0400)] 
client: Revert setting PreferIPv6 on by default

This change broke torsocks that by default is expecting an IPv4 for hostname
resolution because it can't ask tor for a specific IP version with the SOCKS5
extension.

PreferIPv6 made it that sometimes the IPv6 could be returned to torsocks that
was expecting an IPv4.

Torsocks is probably a very unique case because the runtime flow is that it
hijacks DNS resolution (ex: getaddrinfo()), gets an IP and then sends it back
for the connect() to happen.

The libc has DNS resolution functions that allows the caller to request a
specific INET family but torsocks can't tell tor to resolve the hostname only
to an IPv4 or IPv6 and thus by default fallsback to IPv4.

Reverting this change into 0.4.3.x series but we'll keep it in the 0.4.4.x
series in the hope that we add this SOCKS5 extension to tor for DNS resolution
and then change torsocks to use that.

Fixes #33804

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
teor [Thu, 9 Apr 2020 01:03:34 +0000 (11:03 +1000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Thu, 9 Apr 2020 01:03:27 +0000 (11:03 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
teor [Thu, 9 Apr 2020 01:03:20 +0000 (11:03 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5
teor [Thu, 9 Apr 2020 01:02:49 +0000 (11:02 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

5 years agoCorrect 'was not internal' to 'was internal' in test_external_ip()
Mrigyen Sawant [Tue, 7 Apr 2020 18:02:39 +0000 (23:32 +0530)] 
Correct 'was not internal' to 'was internal' in test_external_ip()

5 years agodoc: Fix another man page typo
teor [Sun, 5 Apr 2020 07:17:03 +0000 (17:17 +1000)] 
doc: Fix another man page typo

The default value of the option is "auto", not "default".

5 years agodoc: Fix a typo in the man page
teor [Sun, 5 Apr 2020 07:10:37 +0000 (17:10 +1000)] 
doc: Fix a typo in the man page

"proceeding" means starting an action.
"preceding" means the thing before this thing.

In this context, it's a bit ambiguous.

5 years agochanges: file for ticket 33782
teor [Sat, 4 Apr 2020 03:20:06 +0000 (13:20 +1000)] 
changes: file for ticket 33782

Avoid conflicts between the fake sockets in tor's unit tests, and real
file descriptors. Resolves issues running unit tests with GitHub
Actions, where the process that embeds or launches the tests has
already opened a large number of file descriptors.

Fixes bug 33782; bugfix on 0.2.8.1-alpha.

Found and fixed by Putta Khunchalee.

5 years agoChange starting file descriptor for tests.
Putta Khunchalee [Fri, 3 Apr 2020 09:47:38 +0000 (16:47 +0700)] 
Change starting file descriptor for tests.

5 years agodoc: Rewrite the approved-routers man page entry
teor [Fri, 3 Apr 2020 04:43:48 +0000 (14:43 +1000)] 
doc: Rewrite the approved-routers man page entry

Obviously correct documentation changes.

5 years agoconfigure: Fix enabled module variable expansion
David Goulet [Tue, 31 Mar 2020 12:21:12 +0000 (08:21 -0400)] 
configure: Fix enabled module variable expansion

Fixes #33646

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agohs-v3: Relax severity of a log message when decoding descriptors.
George Kadianakis [Wed, 11 Mar 2020 13:18:47 +0000 (15:18 +0200)] 
hs-v3: Relax severity of a log message when decoding descriptors.

Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to
ease debugging in the future.

5 years agoMerge branch 'tor-github/pr/1794' into maint-0.4.3
David Goulet [Thu, 26 Mar 2020 13:14:25 +0000 (09:14 -0400)] 
Merge branch 'tor-github/pr/1794' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 25 Mar 2020 14:56:27 +0000 (10:56 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 25 Mar 2020 14:56:27 +0000 (10:56 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'tor-github/pr/1788' into maint-0.4.3
George Kadianakis [Mon, 23 Mar 2020 14:56:59 +0000 (16:56 +0200)] 
Merge branch 'tor-github/pr/1788' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
Nick Mathewson [Fri, 20 Mar 2020 12:06:30 +0000 (08:06 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3

5 years agorelay/dirauth: Set some output arguments in stubs
teor [Fri, 20 Mar 2020 07:01:06 +0000 (17:01 +1000)] 
relay/dirauth: Set some output arguments in stubs

And document how some functions set their output arguments.

Fixes bug 33674; bugfix on 0.4.3.1-alpha.

5 years agoSet *have_low_ports_out from stub port_parse_ports_relay().
Nick Mathewson [Fri, 20 Mar 2020 00:04:53 +0000 (20:04 -0400)] 
Set *have_low_ports_out from stub port_parse_ports_relay().

Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.

Fixes bug 33668; bugfix on 0.4.3.1-alpha.

5 years agopractracker: Disable practracker in git hooks
teor [Fri, 20 Mar 2020 07:32:57 +0000 (17:32 +1000)] 
practracker: Disable practracker in git hooks

Disable our coding standards best practices tracker in our git hooks.

0.4.3 branches only.

Closes ticket 33678.

5 years agodirauth: Remove a duplicate macro definition
teor [Fri, 20 Mar 2020 05:39:55 +0000 (15:39 +1000)] 
dirauth: Remove a duplicate macro definition

Obviously correct changes to already-reviewed code.

5 years agoMerge branch 'bug33673_035' into bug33673_041
teor [Fri, 20 Mar 2020 04:49:11 +0000 (14:49 +1000)] 
Merge branch 'bug33673_035' into bug33673_041

Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.

5 years agoAppveyor: Copy required DLLs to test and app
teor [Thu, 19 Mar 2020 07:35:49 +0000 (17:35 +1000)] 
Appveyor: Copy required DLLs to test and app

Copy required DLLs to test and app, before running tor's tests.

This ensures that tor.exe and test*.exe use the correct version of each
DLL. This fix is not required, but we hope it will avoid DLL search
issues in future.

Closes bug 33673; bugfix on 0.3.4.2-alpha.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
teor [Fri, 20 Mar 2020 01:24:57 +0000 (11:24 +1000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Fri, 20 Mar 2020 01:24:51 +0000 (11:24 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'ticket33643_skip_035' into ticket33643_skip_041
Nick Mathewson [Thu, 19 Mar 2020 22:38:18 +0000 (18:38 -0400)] 
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041

5 years agoAppveyor: disable crypto/openssl_version
Nick Mathewson [Thu, 19 Mar 2020 19:28:55 +0000 (15:28 -0400)] 
Appveyor: disable crypto/openssl_version

5 years agoAdd a TOR_SKIP_TESTCASES environment variable for suppressing tests.
Nick Mathewson [Thu, 19 Mar 2020 19:25:11 +0000 (15:25 -0400)] 
Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.

For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run
the tests and suppress all the "crypto/" tests.  You could get the
same effect by running "./src/test/test :crypto/..", but that can be
harder to arrange from CI.

Part of a fix/workaround for 33643.

5 years agodoc: Fix a manual page typo
teor [Thu, 19 Mar 2020 08:02:32 +0000 (18:02 +1000)] 
doc: Fix a manual page typo

And consistently talk about extra-info document publishing.

Obviously correct documentation changes.

5 years agoMerge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
teor [Thu, 19 Mar 2020 06:56:49 +0000 (16:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3

5 years agodoc: Fix a man page typo
teor [Wed, 18 Mar 2020 23:24:15 +0000 (09:24 +1000)] 
doc: Fix a man page typo

Obviously correct changes to already-reviewed code.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 18 Mar 2020 16:17:20 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 16:17:11 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 16:16:59 +0000 (12:16 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

5 years agoBump version to 0.4.2.7-dev
Nick Mathewson [Wed, 18 Mar 2020 16:16:11 +0000 (12:16 -0400)] 
Bump version to 0.4.2.7-dev

5 years agoBump version to 0.4.1.9-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:53 +0000 (12:15 -0400)] 
Bump version to 0.4.1.9-dev

5 years agoBump version to 0.3.5.10-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:32 +0000 (12:15 -0400)] 
Bump version to 0.3.5.10-dev

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2