]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
4 years agoMerge branch 'maint-0.4.3' into release-0.4.3 release-0.4.3
Nick Mathewson [Wed, 3 Feb 2021 18:39:54 +0000 (13:39 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3 maint-0.4.3
Nick Mathewson [Wed, 3 Feb 2021 18:39:08 +0000 (13:39 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.

4 years agobump to 0.4.3.8-dev
Nick Mathewson [Wed, 3 Feb 2021 18:38:56 +0000 (13:38 -0500)] 
bump to 0.4.3.8-dev

4 years agoBump to 0.3.5.13-dev.
Nick Mathewson [Wed, 3 Feb 2021 18:37:28 +0000 (13:37 -0500)] 
Bump to 0.3.5.13-dev.

4 years agocopy changelog into releasenotes
Nick Mathewson [Wed, 3 Feb 2021 17:58:14 +0000 (12:58 -0500)] 
copy changelog into releasenotes

4 years agoFold in the entry for 2667 tor-0.4.3.8
Nick Mathewson [Wed, 3 Feb 2021 14:53:45 +0000 (09:53 -0500)] 
Fold in the entry for 2667

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Wed, 3 Feb 2021 14:11:14 +0000 (09:11 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Wed, 3 Feb 2021 14:11:14 +0000 (09:11 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'ticket40269_035_01' into maint-0.3.5
David Goulet [Wed, 3 Feb 2021 14:11:09 +0000 (09:11 -0500)] 
Merge branch 'ticket40269_035_01' into maint-0.3.5

4 years agoRemove unused addr_port_set code
David Goulet [Mon, 1 Feb 2021 17:28:29 +0000 (12:28 -0500)] 
Remove unused addr_port_set code

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Wed, 3 Feb 2021 13:56:38 +0000 (08:56 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Wed, 3 Feb 2021 13:56:38 +0000 (08:56 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'ticket40270_035_01' into maint-0.3.5
David Goulet [Wed, 3 Feb 2021 13:56:30 +0000 (08:56 -0500)] 
Merge branch 'ticket40270_035_01' into maint-0.3.5

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Wed, 3 Feb 2021 13:54:40 +0000 (08:54 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Wed, 3 Feb 2021 13:54:40 +0000 (08:54 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agonode: Move reentry set to use a digestmap_t
David Goulet [Mon, 1 Feb 2021 17:20:39 +0000 (12:20 -0500)] 
node: Move reentry set to use a digestmap_t

Any lookup now will be certain and not probabilistic as the bloomfilter.

Closes #40269

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelay: Send back CONNECTION_REFUSED on reentry
David Goulet [Mon, 1 Feb 2021 17:45:32 +0000 (12:45 -0500)] 
relay: Send back CONNECTION_REFUSED on reentry

The TORPROTOCOL reason causes the client to close the circuit which is not
what we want because other valid streams might be on it.

Instead, CONNECTION_REFUSED will leave it open but will not allow more streams
to be attached to it. The client then open a new circuit to the destination.

Closes #40270

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Wed, 3 Feb 2021 13:51:37 +0000 (08:51 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Wed, 3 Feb 2021 13:51:36 +0000 (08:51 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agorelay: Double the size of the relay reentry set
David Goulet [Mon, 1 Feb 2021 14:04:50 +0000 (09:04 -0500)] 
relay: Double the size of the relay reentry set

This is to minimize false positive and thus deny reentry to Exit connections
that were in reality not re-entering. Helps with overall UX.

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelay: Follow consensus parameter for network reentry
David Goulet [Mon, 1 Feb 2021 13:56:27 +0000 (08:56 -0500)] 
relay: Follow consensus parameter for network reentry

Obey the "allow-network-reentry" consensus parameters in order to decide to
allow it or not at the Exit.

Closes #40268

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Wed, 3 Feb 2021 13:44:19 +0000 (08:44 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years ago0438 changelog blurb
Nick Mathewson [Tue, 2 Feb 2021 22:23:16 +0000 (17:23 -0500)] 
0438 changelog blurb

4 years agoStart a changelog for 0.4.3.8
Nick Mathewson [Tue, 2 Feb 2021 20:59:05 +0000 (15:59 -0500)] 
Start a changelog for 0.4.3.8

4 years agoMerge branch 'tor-gitlab/mr/284' into ticket2667_043_01
David Goulet [Fri, 29 Jan 2021 19:51:38 +0000 (14:51 -0500)] 
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01

4 years agotest: Add test for exits blocking reentry to the network
George Kadianakis [Fri, 29 Jan 2021 16:21:30 +0000 (18:21 +0200)] 
test: Add test for exits blocking reentry to the network

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoexit: Deny re-entry into the network
Roger Dingledine [Thu, 28 Jan 2021 04:48:57 +0000 (23:48 -0500)] 
exit: Deny re-entry into the network

Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.

Closes #2667

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelay: Add bloomfiter of relay address + {OR|Dir}Port
David Goulet [Thu, 28 Jan 2021 02:49:56 +0000 (21:49 -0500)] 
relay: Add bloomfiter of relay address + {OR|Dir}Port

In order to deny re-entry in the network, we now keep a bloomfilter of relay
ORPort + address and authorities ORPort + address and DirPort + address
combinations.

So when an Exit stream is handled, we deny anything connecting back into the
network on the ORPorts for relays and on the ORPort+DirPort for the
authorities.

Related to #2667

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:46:31 +0000 (12:46 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:46:31 +0000 (12:46 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/50' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:46:24 +0000 (12:46 -0500)] 
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:42:31 +0000 (12:42 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:42:31 +0000 (12:42 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/239' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:42:26 +0000 (12:42 -0500)] 
Merge branch 'tor-gitlab/mr/239' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:36:42 +0000 (12:36 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:36:42 +0000 (12:36 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/243' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:36:35 +0000 (12:36 -0500)] 
Merge branch 'tor-gitlab/mr/243' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:14:10 +0000 (12:14 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:14:10 +0000 (12:14 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/255' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:11:33 +0000 (12:11 -0500)] 
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/254' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:10:39 +0000 (12:10 -0500)] 
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:08:21 +0000 (12:08 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:08:20 +0000 (12:08 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:08:14 +0000 (12:08 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:04:42 +0000 (12:04 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:04:42 +0000 (12:04 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:04:37 +0000 (12:04 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:02:43 +0000 (12:02 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:02:43 +0000 (12:02 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/140' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:02:39 +0000 (12:02 -0500)] 
Merge branch 'tor-gitlab/mr/140' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 28 Jan 2021 17:00:17 +0000 (12:00 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 28 Jan 2021 17:00:17 +0000 (12:00 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge branch 'tor-gitlab/mr/186' into maint-0.3.5
David Goulet [Thu, 28 Jan 2021 17:00:10 +0000 (12:00 -0500)] 
Merge branch 'tor-gitlab/mr/186' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
Nick Mathewson [Thu, 28 Jan 2021 16:20:20 +0000 (11:20 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoBump to 0.4.3.8.
Nick Mathewson [Thu, 28 Jan 2021 16:18:13 +0000 (11:18 -0500)] 
Bump to 0.4.3.8.

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Thu, 28 Jan 2021 16:17:43 +0000 (11:17 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.

4 years agoBump to 0.3.5.13.
Nick Mathewson [Thu, 28 Jan 2021 16:17:32 +0000 (11:17 -0500)] 
Bump to 0.3.5.13.

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 21 Jan 2021 21:18:43 +0000 (16:18 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 21 Jan 2021 21:18:43 +0000 (16:18 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agogitignore: don't ignore core directory
Alex Xu (Hello71) [Thu, 21 Jan 2021 21:06:28 +0000 (16:06 -0500)] 
gitignore: don't ignore core directory

otherwise src/core is ignored.

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
David Goulet [Thu, 21 Jan 2021 21:06:54 +0000 (16:06 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Thu, 21 Jan 2021 21:06:54 +0000 (16:06 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agobuild: Add "make lsp" command
David Goulet [Wed, 16 Dec 2020 15:01:15 +0000 (10:01 -0500)] 
build: Add "make lsp" command

Generates the compile_commands.json file using the "bear" application so the
ccls server can be more efficient with our code base.

Closes #40227

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
Nick Mathewson [Tue, 19 Jan 2021 17:53:52 +0000 (12:53 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Tue, 19 Jan 2021 17:53:52 +0000 (12:53 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
Nick Mathewson [Tue, 19 Jan 2021 17:53:44 +0000 (12:53 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
Nick Mathewson [Tue, 19 Jan 2021 17:53:30 +0000 (12:53 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
Nick Mathewson [Tue, 19 Jan 2021 17:45:07 +0000 (12:45 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Tue, 19 Jan 2021 17:45:07 +0000 (12:45 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/259' into maint-0.3.5
Nick Mathewson [Tue, 19 Jan 2021 17:44:59 +0000 (12:44 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/259' into maint-0.3.5

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

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 agoBetter fix for #40241 (--enable-all-bugs-are-fatal and fallthrough)
Nick Mathewson [Wed, 13 Jan 2021 14:48:00 +0000 (09:48 -0500)] 
Better fix for #40241 (--enable-all-bugs-are-fatal and fallthrough)

This one should work on GCC _and_ on Clang.  The previous version
made Clang happier by not having unreachable "fallthrough"
statements, but made GCC sad because GCC didn't think that the
unconditional failures were really unconditional, and therefore
_wanted_ a FALLTHROUGH.

This patch adds a FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL macro that
seems to please both GCC and Clang in this case: ordinarily it is a
FALLTHROUGH, but when ALL_BUGS_ARE_FATAL is defined, it's an
abort().

Fixes bug 40241 again.  Bugfix on earlier fix for 40241, which was
merged into maint-0.3.5 and forward, and released in 0.4.5.3-rc.

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 release-0.4.3
Nick Mathewson [Mon, 11 Jan 2021 19:37:29 +0000 (14:37 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

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 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.

4 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.

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

4 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

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

4 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

4 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

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

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

4 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

4 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.

4 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

4 years agoCopy 0.4.3.7 changelog to releasenotes tor-0.4.3.7
Nick Mathewson [Thu, 12 Nov 2020 12:35:53 +0000 (07:35 -0500)] 
Copy 0.4.3.7 changelog to releasenotes

4 years agoMerge branch 'maint-0.4.3' into release-0.4.3
Nick Mathewson [Mon, 9 Nov 2020 22:14:58 +0000 (17:14 -0500)] 
Merge branch 'maint-0.4.3' into release-0.4.3

4 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.

4 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

4 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

4 years agochangelog for 0.4.3.7
Nick Mathewson [Mon, 9 Nov 2020 21:57:57 +0000 (16:57 -0500)] 
changelog for 0.4.3.7

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