]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
4 years agoMerge branch 'maint-0.4.4' into maint-0.4.5
David Goulet [Wed, 13 Jan 2021 15:38:05 +0000 (10:38 -0500)] 
Merge branch 'maint-0.4.4' into maint-0.4.5

4 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
David Goulet [Wed, 13 Jan 2021 15:38:05 +0000 (10:38 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Wed, 13 Jan 2021 15:38:05 +0000 (10:38 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agogitignore: Add Linux core file patterns
David Goulet [Wed, 13 Jan 2021 15:37:56 +0000 (10:37 -0500)] 
gitignore: Add Linux core file patterns

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'mr/252' into maint-0.4.5
George Kadianakis [Wed, 13 Jan 2021 14:01:11 +0000 (16:01 +0200)] 
Merge branch 'mr/252' into maint-0.4.5

4 years agoRemove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS.
Nick Mathewson [Mon, 11 Jan 2021 20:02:23 +0000 (15:02 -0500)] 
Remove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS.

Fixes bug #40234; bugfix on 0.3.2.5-alpha.

4 years agoBump to 0.4.5.3-rc-dev
Nick Mathewson [Tue, 12 Jan 2021 21:08:07 +0000 (16:08 -0500)] 
Bump to 0.4.5.3-rc-dev

4 years agoMerge branch 'ticket40237_044_01' into ticket40237_045_01
David Goulet [Tue, 12 Jan 2021 15:55:21 +0000 (10:55 -0500)] 
Merge branch 'ticket40237_044_01' into ticket40237_045_01

4 years agoMerge branch 'ticket40237_043_01' into ticket40237_044_01
David Goulet [Tue, 12 Jan 2021 15:54:31 +0000 (10:54 -0500)] 
Merge branch 'ticket40237_043_01' into ticket40237_044_01

4 years agotests: Fix unit tests after merge of #40237
David Goulet [Tue, 12 Jan 2021 15:50:01 +0000 (10:50 -0500)] 
tests: Fix unit tests after merge of #40237

4 years agoMerge branch 'ticket40237_035_01' into ticket40237_043_01
David Goulet [Tue, 12 Jan 2021 15:46:25 +0000 (10:46 -0500)] 
Merge branch 'ticket40237_035_01' into ticket40237_043_01

4 years agohs-v3: Require reasonably live consensus
David Goulet [Mon, 11 Jan 2021 21:01:22 +0000 (16:01 -0500)] 
hs-v3: Require reasonably live consensus

Some days before this commit, the network experienced a DDoS on the directory
authorities that prevented them to generate a consensus for more than 5 hours
straight.

That in turn entirely disabled onion service v3, client and service side, due
to the subsystem requiring a live consensus to function properly.

We know require a reasonably live consensus which means that the HSv3
subsystem will to its job for using the best consensus tor can find. If the
entire network is using an old consensus, than this should be alright.

If the service happens to use a live consensus while a client is not, it
should still work because the client will use the current SRV it sees which
might be the previous SRV for the service for which it still publish
descriptors for.

If the service is using an old one and somehow can't get a new one while
clients are on a new one, then reachability issues might arise. However, this
is a situation we already have at the moment since the service will simply not
work if it doesn't have a live consensus while a client has one.

Fixes #40237

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 11 Jan 2021 19:37:29 +0000 (14:37 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

4 years agoMerge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Mon, 11 Jan 2021 19:37:29 +0000 (14:37 -0500)] 
Merge branch 'maint-0.4.4' into maint-0.4.5

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 11 Jan 2021 19:37:28 +0000 (14:37 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'ticket40241_035' into maint-0.3.5
Nick Mathewson [Mon, 11 Jan 2021 19:37:14 +0000 (14:37 -0500)] 
Merge branch 'ticket40241_035' into maint-0.3.5

4 years agoFix warnings in current debian-hardened CI.
Nick Mathewson [Mon, 11 Jan 2021 19:25:56 +0000 (14:25 -0500)] 
Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.

4 years agoIncrement version to 0.4.5.3-rc
Nick Mathewson [Mon, 11 Jan 2021 17:48:00 +0000 (12:48 -0500)] 
Increment version to 0.4.5.3-rc

5 years agorelay: Log address suggested by directory authorities
David Goulet [Mon, 21 Dec 2020 19:41:52 +0000 (14:41 -0500)] 
relay: Log address suggested by directory authorities

If we get an address suggestion from a directory authority and we have no
address configured or discovered, log it at notice level so the operator can
learn what address will be used by Tor.

Fixes #40201

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'mr_240_squashed' into maint-0.4.5
Nick Mathewson [Mon, 21 Dec 2020 18:25:52 +0000 (13:25 -0500)] 
Merge branch 'mr_240_squashed' into maint-0.4.5

5 years agotest: Fix memleak in test/load_stats_file
David Goulet [Mon, 21 Dec 2020 18:10:58 +0000 (13:10 -0500)] 
test: Fix memleak in test/load_stats_file

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoFix timestamp parser in new load_stats_file.
Karsten Loesing [Wed, 16 Dec 2020 08:58:19 +0000 (09:58 +0100)] 
Fix timestamp parser in new load_stats_file.

The previous parser only considered stats files _starting_ with the
timestamp tag, not stats files having the timestamp tag in a later
position. While this applies to all current stats files, a future
stats file might look differently. Better to fix the function now than
be surprised in another 9 years from now.

This commit also adds a test case for such future stats, and it fixes
stats file paths in newly added unit tests.

5 years agorelay: Report the entire content of a stats file
David Goulet [Tue, 15 Dec 2020 16:41:42 +0000 (11:41 -0500)] 
relay: Report the entire content of a stats file

It turns out that 9 years ago, we stopped appending data into stats file and
rather overwrite everytime we have new stats (see commit
a6a127c833eace1100aca7ab8ad118862bb8a8b9)

The load_stats_file() function was still thinking that we could have the same
line many times in the file which turns out to be false since 9 years ago.
However, that did not cause problem until IPv6 connection stats came along
which introduced a new line in conn-stats: "ipv6-conn-bi-direct ...".

Before, that file contained a single line starting with the tag
"conn-bi-direct".  That very tag appears also in the IPv6 tag (see above) so
the load_stats_file() function would consider that the IPv6 line as the last
tag to be appeneded to the file and fail to report the line above (for IPv4).
It would actually truncate the IPv6 line and report it (removing the "ipv6-"
part).

In other words, "conn-bi-direct" was not reported and instead
"ipv6-conn-bi-direct" was used without the "ipv6-" part.

This commit refactors the entire function so that now it looks for a
"timestamp tag" to validate and then if everything is fine, returns the entire
content of the file. The refactor simplifies the function, adds logging in
case of failures and modernize it in terms of coding standard.

Unit tests are also added that makes sure the loaded content matches the
entire file if timestamp validation passes.

Fixes #40226

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'tor-gitlab/mr/243' into maint-0.4.5
David Goulet [Thu, 17 Dec 2020 13:25:18 +0000 (08:25 -0500)] 
Merge branch 'tor-gitlab/mr/243' into maint-0.4.5

5 years agoFix Keccak undefined behavior on exotic platforms.
George Kadianakis [Thu, 17 Dec 2020 11:49:17 +0000 (13:49 +0200)] 
Fix Keccak undefined behavior on exotic platforms.

Bug reported and diagnosed in:
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975977

Fixes bug #40210.

5 years agoMerge branch 'tor-gitlab/mr/234' into maint-0.4.5
Alexander Færøy [Wed, 16 Dec 2020 20:38:23 +0000 (20:38 +0000)] 
Merge branch 'tor-gitlab/mr/234' into maint-0.4.5

5 years agoconfig: Catch missing Bridge for ClientTransportPlugin
David Goulet [Tue, 8 Dec 2020 15:01:23 +0000 (10:01 -0500)] 
config: Catch missing Bridge for ClientTransportPlugin

When making sure we have a Bridge line with a ClientTransportPlugin, we
now check in the managed proxy list and so we can catch any missing
ClientTransportPlugin for a Bridge line.

Fixes #40106

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5
Alexander Færøy [Wed, 16 Dec 2020 20:31:10 +0000 (20:31 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5
Alexander Færøy [Wed, 16 Dec 2020 20:29:03 +0000 (20:29 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5

5 years agoMerge branch 'tor-gitlab/mr/239' into maint-0.4.5
David Goulet [Tue, 15 Dec 2020 16:58:13 +0000 (11:58 -0500)] 
Merge branch 'tor-gitlab/mr/239' into maint-0.4.5

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/205' into maint-0.4.5
George Kadianakis [Tue, 15 Dec 2020 14:28:49 +0000 (16:28 +0200)] 
Merge remote-tracking branch 'tor-gitlab/mr/205' into maint-0.4.5

5 years agoSocks5: handle truncated client requests correctly
Nick Mathewson [Mon, 14 Dec 2020 15:14:03 +0000 (10:14 -0500)] 
Socks5: handle truncated client requests correctly

Previously, our code would send back an error if the socks5 request
parser said anything but DONE.  But there are other non-error cases,
like TRUNCATED: we shouldn't send back errors for them.

This patch lowers the responsibility for setting the error message
into the parsing code, since the actual type of the error message
will depend on what problem was encountered.

Fixes bug 40190; bugfix on 0.3.5.1-alpha.

5 years agoconfigure: Revert back the static libevent path
David Goulet [Fri, 11 Dec 2020 14:52:23 +0000 (09:52 -0500)] 
configure: Revert back the static libevent path

From c618c4f27986825df2026fb22b8ee222edd1afa1, we changed the static
libevent.a path to be able to use the git repository or tarball directly but
that broke the "make install" setup that Tor Browser is using with Android.

In other words, the git repository and tarball put the "libevent.a" in
".libs/" where "make install" puts it in "lib/".

Using the --with-libevent-dir=..., which is mandatory for static libevent,
autoconf will take the path and use it for the includes (-I) and library (-L)
for which if it finds a "include/" and a "lib/" in the root, it will use
those.

However, with the git repo or tarball, the "lib/" doesn't exists thus autoconf
sets the library search path to be at the root and thus fails to find the
libevent.a in ".libs/".

This is a whole lot more work to make both cases work in our configure.ac thus
I'm reverting the change here to the Tor Browser case works again and the work
around for others is to either symlink the libevent.a at the root or use a
temporary make install directory.

One long term fix here would likely be to ask libevent to symblink the .a into
the root along the .la files and likely do the same for .so. Or, use the
"lib/" structure to contain the .a + .so files. Would be better than doing
ninji-tsu in our configure.ac

Fixes #40225

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoTweak the documentation for approved-routers
Nick Mathewson [Wed, 9 Dec 2020 19:08:15 +0000 (14:08 -0500)] 
Tweak the documentation for approved-routers

Document !badexit, and improve the documentation for !invalid.

Closes #40188.

5 years agoAvoid sandbox bug warning when unglobbing patterns #40094
Daniel Pinto [Fri, 13 Nov 2020 01:08:56 +0000 (01:08 +0000)] 
Avoid sandbox bug warning when unglobbing patterns #40094

Adds a more user-friendly error message when the configuration is
reloaded and a new %include is added that makes its unglobbing
access files/folders not allowed by the seccomp sandbox.

5 years agoFix a couple of documentation comments related to #40094
Nick Mathewson [Tue, 8 Dec 2020 19:59:28 +0000 (14:59 -0500)] 
Fix a couple of documentation comments related to #40094

5 years agorelay: Avoid log reachability test for bandwidth test circuit
David Goulet [Tue, 8 Dec 2020 16:58:10 +0000 (11:58 -0500)] 
relay: Avoid log reachability test for bandwidth test circuit

Fixes #40205

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoconfigure: Fix the --enable-static-tor switch
David Goulet [Wed, 18 Nov 2020 16:24:38 +0000 (11:24 -0500)] 
configure: Fix the --enable-static-tor switch

The "-static" compile flag was set globally which means that all autoconf test
were attempting to be built statically and lead to failures of detecting
OpenSSL libraries and others.

This commit adds this flag only to the "tor" binary build.

There is also a fix on where to find libevent.a since it is using libtool, it
is in .libs/.

At this commit, there are still warnings being emitted that informs the user
that the built binary must still be linked dynamically with glibc.

Fixes #40111

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agobump to 0.4.5.2-alpha-dev
Nick Mathewson [Mon, 23 Nov 2020 19:03:14 +0000 (14:03 -0500)] 
bump to 0.4.5.2-alpha-dev

5 years agoBump to 0.4.5.2-alpha.
Nick Mathewson [Sat, 21 Nov 2020 20:09:08 +0000 (15:09 -0500)] 
Bump to 0.4.5.2-alpha.

5 years agoMerge branch 'maint-0.4.4' into maint-0.4.5
Alexander Færøy [Thu, 19 Nov 2020 17:44:00 +0000 (17:44 +0000)] 
Merge branch 'maint-0.4.4' into maint-0.4.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Alexander Færøy [Thu, 19 Nov 2020 17:43:59 +0000 (17:43 +0000)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3
Alexander Færøy [Thu, 19 Nov 2020 17:43:44 +0000 (17:43 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3

5 years agoconfig: Bridge line with a transport must have a ClientTransportPlugin
David Goulet [Tue, 22 Sep 2020 14:45:52 +0000 (10:45 -0400)] 
config: Bridge line with a transport must have a ClientTransportPlugin

Fixes #25528

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'tor-gitlab/mr/144' into maint-0.4.5
David Goulet [Wed, 18 Nov 2020 16:29:02 +0000 (11:29 -0500)] 
Merge branch 'tor-gitlab/mr/144' into maint-0.4.5

5 years agosendme: Turn log warning into debug
David Goulet [Tue, 17 Nov 2020 18:23:29 +0000 (13:23 -0500)] 
sendme: Turn log warning into debug

When sending the stream level SENDME, it is possible the cirucit was marked
for close or any other failures that can occur. These events can occur
naturally.

Fixes #40142

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'tor-gitlab/mr/203' into maint-0.4.5
David Goulet [Tue, 17 Nov 2020 17:25:48 +0000 (12:25 -0500)] 
Merge branch 'tor-gitlab/mr/203' into maint-0.4.5

5 years agoconfig: Really ignore non ORPorts when removing duplicates
David Goulet [Tue, 17 Nov 2020 14:40:16 +0000 (09:40 -0500)] 
config: Really ignore non ORPorts when removing duplicates

The function in charge of removing duplicate ORPorts from our configured ports
was skipping all non ORPorts port but only for the outer loop thus resulting
in comparing an ORPort with a non-ORPort which lead to problems.

For example, tor configured with the following would fail:

  ORPort auto
  DirPort auto

Both end up being the same configuration except that one is a OR listener and
one is a Dir listener. Thus because of the missing check in the inner loop,
they looked exactly the same and thus one is removed.

Fixes #40195

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'ticket40071_045_01_squashed' into master
Nick Mathewson [Tue, 17 Nov 2020 12:58:37 +0000 (07:58 -0500)] 
Merge branch 'ticket40071_045_01_squashed' into master

5 years agochanges: Add file for #40071
David Goulet [Thu, 12 Nov 2020 17:39:25 +0000 (12:39 -0500)] 
changes: Add file for #40071

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agorelay: Launch dummy circuit only when descriptor build fails
David Goulet [Fri, 18 Sep 2020 17:07:11 +0000 (13:07 -0400)] 
relay: Launch dummy circuit only when descriptor build fails

First, this commit moves the launch_dummy_circuit_as_needed() function into
relay_find_addr.c and renames it to relay_addr_learn_from_dirauth(). This is
an attempt to centralize anything relate with address discovery in the right
module.

Second, when building a descriptor and we fail to discover our address,
immediately launch a dummy circuit to an authority in an attempt to learn our
descriptor.

It is still only done every 20 minutes even though the descriptor build is
done every minute. We ought to avoid load on the authority and if we can't
learn in the first place our address from them, chances are more things are
wrong.

Related to #40071

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agorelay: Look at our cache when looking for an IP change
David Goulet [Fri, 18 Sep 2020 16:22:23 +0000 (12:22 -0400)] 
relay: Look at our cache when looking for an IP change

Regularly, tor looks if its IP has changed. It does the entire auto discovery
process again. However, it is possible that it does not find anything.

Instead of thinking the IP changed to an unknown address, look at our cache
and see if that value has changed.

The reason for this is because if tor gets its address as a suggestion from a
directory authority, it is because the auto discovery failed and thus that
address should be consider for the IP change check.

Related to #40071

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agorelay: Use testing circuit instead of dummy descriptor fetch
David Goulet [Fri, 18 Sep 2020 15:50:12 +0000 (11:50 -0400)] 
relay: Use testing circuit instead of dummy descriptor fetch

Tor now can learn its address from a NETINFO cell coming from an authority.
Thus, instead from launching a dummy descriptor fetch to learn the address
from the directory response (unauthenticated), we simply now launch a one-hop
testing circuit.

Related to #40071

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge remote-tracking branch 'tor-gitlab/mr/197' into master
Nick Mathewson [Tue, 17 Nov 2020 03:43:09 +0000 (22:43 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/197' into master

5 years agoMerge branch 'maint-0.4.4' into master
Nick Mathewson [Tue, 17 Nov 2020 03:42:23 +0000 (22:42 -0500)] 
Merge branch 'maint-0.4.4' into master

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 17 Nov 2020 03:42:22 +0000 (22:42 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Tue, 17 Nov 2020 03:42:22 +0000 (22:42 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5
Nick Mathewson [Tue, 17 Nov 2020 03:42:15 +0000 (22:42 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5

5 years agoport: Don't ignore ports of a different family
David Goulet [Thu, 12 Nov 2020 16:22:02 +0000 (11:22 -0500)] 
port: Don't ignore ports of a different family

Commit c3a0f757964de0e8a24911d72abff5df20bb323c added this feature for ORPort
that we ignore any port that is not the family of our default address when
parsing the port. So if port_parse_config() was called with an IPv4 default
address, all IPv6 address would be ignored.

That makes sense for ORPort since we call twice port_parse_config() for
0.0.0.0 and [::] but for the rest of the ports, it is not good since a
perfectly valid configuration can be:

  SocksPort 9050
  SocksPort [::1]:9050

Any non-ORPort only binds by default to an IPv4 except the ORPort that binds
to both IPv4 and IPv6 by default.

The fix here is to always parse all ports within port_parse_config() and then,
specifically for ORPort, remove the duplicates or superseding ones. The
warning is only emitted when a port supersedes another.

A unit tests is added to make sure SocksPort of different family always exists
together.

Fixes #40183

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoUse connection_or_change_state() in v3 handshaking state change
Neel Chauhan [Mon, 9 Nov 2020 22:31:01 +0000 (14:31 -0800)] 
Use connection_or_change_state() in v3 handshaking state change

5 years agoWhen handling includes, detect missing interned strings earlier.
Nick Mathewson [Thu, 12 Nov 2020 16:55:55 +0000 (11:55 -0500)] 
When handling includes, detect missing interned strings earlier.

There were three separate places where we were hitting a sandbox Bug
warning before we actually exited.

Fixes #40094; bugfix on 0.3.1.1-alpha when %includes were introduced.

5 years agoFix typos.
Samanta Navarro [Wed, 11 Nov 2020 11:38:19 +0000 (11:38 +0000)] 
Fix typos.

Typos found with codespell.

Please keep in mind that this should have impact on actual code
and must be carefully evaluated:

src/core/or/lttng_circuit.inc
-    ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER)
+    ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)

5 years agoDeliberately close OR connections if proxies leave extra data
Nick Mathewson [Thu, 12 Nov 2020 16:07:33 +0000 (11:07 -0500)] 
Deliberately close OR connections if proxies leave extra data

We already did this, but we did it by accident, which is pretty
risky: if we hadn't, then our code would have treated extra data in
the inbuf as having been transmitted as TLS-authenticated data.

Closes ticket 40017; Found by opara.

5 years agoMerge branch 'ticket40187' into master
Nick Mathewson [Thu, 12 Nov 2020 14:43:09 +0000 (09:43 -0500)] 
Merge branch 'ticket40187' into master

5 years agoCorrect EOL date for 0.4.3.x
Nick Mathewson [Thu, 12 Nov 2020 14:42:54 +0000 (09:42 -0500)] 
Correct EOL date for 0.4.3.x

5 years agoFake the current time when we're loading TEST_DESCRIPTORS.
Nick Mathewson [Thu, 12 Nov 2020 14:28:27 +0000 (09:28 -0500)] 
Fake the current time when we're loading TEST_DESCRIPTORS.

Fixes bug 40187; bugfix on 0.4.5.1-alpha.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/183' into master
Nick Mathewson [Thu, 12 Nov 2020 13:47:05 +0000 (08:47 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/183' into master

5 years agoMerge branch 'maint-0.4.4' into master
Nick Mathewson [Thu, 12 Nov 2020 13:13:26 +0000 (08:13 -0500)] 
Merge branch 'maint-0.4.4' into master

"ours" to avoid version bump.

5 years agoBump to 0.4.4.6-dev
Nick Mathewson [Thu, 12 Nov 2020 13:13:07 +0000 (08:13 -0500)] 
Bump to 0.4.4.6-dev

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 12 Nov 2020 13:12:20 +0000 (08:12 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" to avoid version bump.

5 years agoBump to 0.4.3.7-dev
Nick Mathewson [Thu, 12 Nov 2020 13:12:11 +0000 (08:12 -0500)] 
Bump to 0.4.3.7-dev

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Thu, 12 Nov 2020 13:11:20 +0000 (08:11 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.

5 years agoBump to 0.3.5.12-dev
Nick Mathewson [Thu, 12 Nov 2020 13:11:01 +0000 (08:11 -0500)] 
Bump to 0.3.5.12-dev

5 years agoCopy ChangeLog and ReleaseNotes from today's releases to master branch
Nick Mathewson [Thu, 12 Nov 2020 12:37:25 +0000 (07:37 -0500)] 
Copy ChangeLog and ReleaseNotes from today's releases to master branch

5 years agochanges file for bug 40172.
Nick Mathewson [Tue, 10 Nov 2020 22:29:37 +0000 (17:29 -0500)] 
changes file for bug 40172.

5 years agoExport RANLIB so it's available in combine_libs script
Matthew Finkel [Tue, 10 Nov 2020 21:57:03 +0000 (21:57 +0000)] 
Export RANLIB so it's available in combine_libs script

Fixes 40172; bugfix on 0.4.5.1-alpha

5 years agoMerge branch 'maint-0.4.4' into master
Nick Mathewson [Mon, 9 Nov 2020 22:14:01 +0000 (17:14 -0500)] 
Merge branch 'maint-0.4.4' into master

"-s ours" to avoid version bump.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 9 Nov 2020 22:13:41 +0000 (17:13 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"-s ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 9 Nov 2020 22:13:25 +0000 (17:13 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"-s ours" to avoid version bump.

5 years agoBump to 0.4.4.6
Nick Mathewson [Mon, 9 Nov 2020 22:13:02 +0000 (17:13 -0500)] 
Bump to 0.4.4.6

5 years agoBump to 0.4.3.7
Nick Mathewson [Mon, 9 Nov 2020 22:12:41 +0000 (17:12 -0500)] 
Bump to 0.4.3.7

5 years agoBump to 0.3.5.12
Nick Mathewson [Mon, 9 Nov 2020 22:12:18 +0000 (17:12 -0500)] 
Bump to 0.3.5.12

5 years agoMerge branch 'maint-0.4.4' into master
Nick Mathewson [Mon, 9 Nov 2020 21:17:50 +0000 (16:17 -0500)] 
Merge branch 'maint-0.4.4' into master

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 9 Nov 2020 21:17:42 +0000 (16:17 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 9 Nov 2020 21:13:42 +0000 (16:13 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
Nick Mathewson [Mon, 9 Nov 2020 21:13:24 +0000 (16:13 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/193'
Alexander Færøy [Mon, 9 Nov 2020 14:15:07 +0000 (14:15 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/193'

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/192'
Alexander Færøy [Mon, 9 Nov 2020 14:15:03 +0000 (14:15 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/192'

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/190'
Alexander Færøy [Mon, 9 Nov 2020 14:12:45 +0000 (14:12 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/190'

5 years agoRename OpenSSL_version_num() as defined in Tor
Nick Mathewson [Fri, 6 Nov 2020 15:29:28 +0000 (10:29 -0500)] 
Rename OpenSSL_version_num() as defined in Tor

This way, if we guess wrong about whether the library has it,
we don't conflict with the library's headers.

Fixes #40181; bug not in any released version.

5 years agoMake config/parse_tcp_proxy_line work in the presence of DNS hijacking
Nick Mathewson [Thu, 5 Nov 2020 14:47:32 +0000 (09:47 -0500)] 
Make config/parse_tcp_proxy_line work in the presence of DNS hijacking

We can use our existing mocking functionality to do this: We have
been in this position before.

Fixes part of #40179; bugfix on 0.4.3.1-alpha.

5 years agoHandle a change in the implementation of hashlib in Python 3.9
Nick Mathewson [Thu, 5 Nov 2020 14:34:36 +0000 (09:34 -0500)] 
Handle a change in the implementation of hashlib in Python 3.9

Previously, hashlib.shake_256 was a class (if present); now it can
also be a function.  This change invalidated our old
compatibility/workaround code, and made one of our tests fail.

Fixes bug 40179; bugfix on 0.3.1.6-rc when the workaround code was
added.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/185' into master
George Kadianakis [Tue, 3 Nov 2020 14:06:12 +0000 (16:06 +0200)] 
Merge remote-tracking branch 'tor-gitlab/mr/185' into master

5 years agoconfigure: Check STAP_PROBEV macro when building with USDT tracing
David Goulet [Tue, 3 Nov 2020 13:59:29 +0000 (08:59 -0500)] 
configure: Check STAP_PROBEV macro when building with USDT tracing

It turns out that STAP_PROBEV() is not available on FreeBSD thus having
sdt/sdt.h is not enough. Look for it now at configure time.

Closes #40174

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoci: Add DISTCHECK to tracing test on Gitlab
David Goulet [Tue, 3 Nov 2020 13:36:02 +0000 (08:36 -0500)] 
ci: Add DISTCHECK to tracing test on Gitlab

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge remote-tracking branch 'tor-gitlab/mr/187' into master
George Kadianakis [Tue, 3 Nov 2020 11:04:09 +0000 (13:04 +0200)] 
Merge remote-tracking branch 'tor-gitlab/mr/187' into master

5 years agoMerge branch 'tor-gitlab/mr/186'
David Goulet [Mon, 2 Nov 2020 18:14:02 +0000 (13:14 -0500)] 
Merge branch 'tor-gitlab/mr/186'

5 years agoMerge branch 'tor-gitlab/mr/188'
David Goulet [Mon, 2 Nov 2020 18:09:15 +0000 (13:09 -0500)] 
Merge branch 'tor-gitlab/mr/188'

5 years agoor: Missing .inc file in include.am
David Goulet [Mon, 2 Nov 2020 13:25:48 +0000 (08:25 -0500)] 
or: Missing .inc file in include.am

Fixes #40173

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoFix another duplicate typedef.
Nick Mathewson [Mon, 2 Nov 2020 12:15:10 +0000 (07:15 -0500)] 
Fix another duplicate typedef.

Fixes #40177; bugfix on 0.4.5.1-alpha.