]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
3 years agofix typo in changelog
Roger Dingledine [Mon, 7 Mar 2022 19:35:48 +0000 (14:35 -0500)] 
fix typo in changelog

3 years agoversion: Bump version to 0.4.7.4-alpha-dev
Tor CI Release [Fri, 25 Feb 2022 15:19:09 +0000 (15:19 +0000)] 
version: Bump version to 0.4.7.4-alpha-dev

3 years agoversion: Bump version to 0.4.7.4-alpha tor-0.4.7.4-alpha
Tor CI Release [Fri, 25 Feb 2022 14:09:50 +0000 (14:09 +0000)] 
version: Bump version to 0.4.7.4-alpha

3 years agorelease: ChangeLog and ReleaseNotes for 0.4.7.4-alpha
Tor CI Release [Fri, 25 Feb 2022 14:09:50 +0000 (14:09 +0000)] 
release: ChangeLog and ReleaseNotes for 0.4.7.4-alpha

3 years agofallbackdir: Update list generated on February 25, 2022
Tor CI Release [Fri, 25 Feb 2022 14:09:00 +0000 (14:09 +0000)] 
fallbackdir: Update list generated on February 25, 2022

3 years agoUpdate geoip files to match ipfire location db, 2022/02/25.
Tor CI Release [Fri, 25 Feb 2022 13:54:26 +0000 (13:54 +0000)] 
Update geoip files to match ipfire location db, 2022/02/25.

3 years agoMerge branch 'tor-gitlab/mr/488'
David Goulet [Wed, 23 Feb 2022 20:21:40 +0000 (15:21 -0500)] 
Merge branch 'tor-gitlab/mr/488'

3 years agocc: Fix memleak when building extension response
David Goulet [Wed, 23 Feb 2022 18:22:59 +0000 (13:22 -0500)] 
cc: Fix memleak when building extension response

Fixes #40575

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoMerge branch 'tor-gitlab/mr/536'
David Goulet [Wed, 23 Feb 2022 18:19:10 +0000 (13:19 -0500)] 
Merge branch 'tor-gitlab/mr/536'

3 years agoand fix those typos in the releasenotes too
Roger Dingledine [Wed, 23 Feb 2022 15:22:18 +0000 (10:22 -0500)] 
and fix those typos in the releasenotes too

3 years agofix typos, remove wrong stanzas, update 0.4.6.10
Roger Dingledine [Wed, 23 Feb 2022 15:07:43 +0000 (10:07 -0500)] 
fix typos, remove wrong stanzas, update 0.4.6.10

we were missing the 0.4.6.10 changes in ReleaseNotes, and the
0.4.0.5 releasenotes mistakenly included some 0.4.0.x bugfixes.

3 years agofix a typo in a comment
Roger Dingledine [Wed, 23 Feb 2022 15:03:24 +0000 (10:03 -0500)] 
fix a typo in a comment

3 years agoReject intro2 cells that request unadvertized congestion control.
Mike Perry [Wed, 23 Feb 2022 00:42:31 +0000 (00:42 +0000)] 
Reject intro2 cells that request unadvertized congestion control.

3 years agoProperly initialize the cc_enabled field in hs intro data.
Mike Perry [Wed, 23 Feb 2022 00:23:23 +0000 (00:23 +0000)] 
Properly initialize the cc_enabled field in hs intro data.

3 years agoAdd test for sendme_inc validation.
Mike Perry [Thu, 17 Feb 2022 17:36:46 +0000 (17:36 +0000)] 
Add test for sendme_inc validation.

3 years agoAdd test for sendme_cell_is_next with sendme_inc of 31
Mike Perry [Thu, 17 Feb 2022 00:26:08 +0000 (00:26 +0000)] 
Add test for sendme_cell_is_next with sendme_inc of 31

3 years agoAdd test for circuit_sendme_cell_is_next() when sendme_inc is 100.
Mike Perry [Thu, 17 Feb 2022 00:04:41 +0000 (00:04 +0000)] 
Add test for circuit_sendme_cell_is_next() when sendme_inc is 100.

This ensures compatibility with old tor.

3 years agoAdd changes file
Mike Perry [Fri, 4 Feb 2022 00:46:50 +0000 (00:46 +0000)] 
Add changes file

3 years agoAdd a delta parameter to Vegas.
Mike Perry [Tue, 1 Feb 2022 15:32:08 +0000 (15:32 +0000)] 
Add a delta parameter to Vegas.

This allows us to cap the queue use during steady state. In shadow, this
reduced instances of long circuit queues at relays.

3 years agoExit slow start at the gamma threshold
Mike Perry [Sun, 23 Jan 2022 18:15:12 +0000 (18:15 +0000)] 
Exit slow start at the gamma threshold

This improves performance and fairness.

3 years agoIncrement by at least 2 sendme_incs in slow start
Mike Perry [Sat, 22 Jan 2022 19:22:40 +0000 (19:22 +0000)] 
Increment by at least 2 sendme_incs in slow start

3 years agoOnly apply more frequent cwnd updates after slow start.
Mike Perry [Fri, 21 Jan 2022 23:20:52 +0000 (23:20 +0000)] 
Only apply more frequent cwnd updates after slow start.

3 years agoMake N_EWMA a percentage of CWND update rate, capped by a max value.
Mike Perry [Fri, 21 Jan 2022 23:00:35 +0000 (23:00 +0000)] 
Make N_EWMA a percentage of CWND update rate, capped by a max value.

This proved better in Shadow sims than just a multiple of CWND.

3 years agoRelocate two parameters from circuit scope to global scope.
Mike Perry [Fri, 21 Jan 2022 19:47:39 +0000 (19:47 +0000)] 
Relocate two parameters from circuit scope to global scope.

Changes in these will not affect in-progress transfers.

3 years agoGuard against 0 time delta in BDP calc.
Mike Perry [Fri, 21 Jan 2022 18:40:49 +0000 (18:40 +0000)] 
Guard against 0 time delta in BDP calc.

This can only happen in Shadow, but it will cause issues there.

3 years agoIncrease RTT ratio used to detect monotime jumps/stalls.
Mike Perry [Fri, 21 Jan 2022 18:09:48 +0000 (18:09 +0000)] 
Increase RTT ratio used to detect monotime jumps/stalls.

In Shadow, we saw RTT jumps as high as 1000 naturally.

So let's set this to 5000, to give us some breathing room.

3 years agoFix NULL pointer deref in logs
Mike Perry [Wed, 13 Oct 2021 21:06:33 +0000 (21:06 +0000)] 
Fix NULL pointer deref in logs

3 years agoProperly compute the number or recv cells from deliver_window
Mike Perry [Wed, 1 Dec 2021 23:20:17 +0000 (23:20 +0000)] 
Properly compute the number or recv cells from deliver_window

Without this conversion, there is an implict 1000-recv_cells, which causes
the mod to fail if it is not a factor of 1000.

3 years agoUse path type hint for Vegas queue parameters.
Mike Perry [Thu, 3 Feb 2022 12:01:23 +0000 (12:01 +0000)] 
Use path type hint for Vegas queue parameters.

These parameters will vary depending on path length, especially for onions.

3 years agoSet new defaults for congestion control parameters.
Mike Perry [Fri, 21 Jan 2022 15:17:20 +0000 (15:17 +0000)] 
Set new defaults for congestion control parameters.

Defaults determined from Shadow experimentation.

More parameter functionality changes to follow.

3 years agocc: Change edge_get_ccontrol() to look at both cpath and on_circuit
David Goulet [Wed, 12 Jan 2022 16:49:04 +0000 (11:49 -0500)] 
cc: Change edge_get_ccontrol() to look at both cpath and on_circuit

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Fix tests for congestion control
David Goulet [Thu, 3 Feb 2022 12:11:42 +0000 (12:11 +0000)] 
hs: Fix tests for congestion control

3 years agohs: Setup congestion control on service rends using intro data
David Goulet [Thu, 3 Feb 2022 21:18:52 +0000 (21:18 +0000)] 
hs: Setup congestion control on service rends using intro data

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Decode and cache the INTRODUCE cell congestion control extension
David Goulet [Thu, 3 Feb 2022 22:44:25 +0000 (22:44 +0000)] 
hs: Decode and cache the INTRODUCE cell congestion control extension

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Build INTRODUCE extension in the encrypted section
David Goulet [Thu, 3 Feb 2022 21:06:28 +0000 (21:06 +0000)] 
hs: Build INTRODUCE extension in the encrypted section

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Setup congestion control on client rends
David Goulet [Thu, 3 Feb 2022 19:37:30 +0000 (19:37 +0000)] 
hs: Setup congestion control on client rends

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Republish onion descriptor on sendme_inc change
David Goulet [Thu, 3 Feb 2022 19:04:34 +0000 (19:04 +0000)] 
hs: Republish onion descriptor on sendme_inc change

Republishing is necessary to ensure that clients connect using the correct
sendme_inc upon any change. Additionally, introduction points must be
re-chosen, so that cached descriptors with old values are not usable.

We do not expect to change sendme_inc, unless cell size or TLS record size
changes, so this should be rare.

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Decode flow-control line
David Goulet [Thu, 3 Feb 2022 20:06:36 +0000 (20:06 +0000)] 
hs: Decode flow-control line

This puts the flow control version (unparsed) in the descriptor. The
client doesn't use it yet.

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agohs: Encode flow control value in the descriptor
David Goulet [Thu, 4 Nov 2021 14:26:04 +0000 (10:26 -0400)] 
hs: Encode flow control value in the descriptor

This simply adds the "flow-control" line, as detailed in prop324, to the
descriptor. No decoding is done at this commit.

Part of #40506

3 years agocc: Export sendme_inc validation into public function
David Goulet [Thu, 3 Feb 2022 22:43:58 +0000 (22:43 +0000)] 
cc: Export sendme_inc validation into public function

This is needed for client validation of server descriptor value,
before launching a rend/intro.

3 years agocc: Use trunnel extension for ntorv3 circ parameters
David Goulet [Tue, 14 Dec 2021 16:38:22 +0000 (11:38 -0500)] 
cc: Use trunnel extension for ntorv3 circ parameters

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agotrunnel: Make hs/cell_common.trunnel generic
David Goulet [Tue, 14 Dec 2021 14:42:02 +0000 (09:42 -0500)] 
trunnel: Make hs/cell_common.trunnel generic

Move it to extension.trunnel instead so that extension ABI construction
can be used in other parts of tor than just HS cells.

Specifically, we'll use it in the ntorv3 data payload and make a
congestion control parameter extension using that binary structure.

Only rename. No code behavior changes.

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoprotover: Add function to get the value of a single type
David Goulet [Thu, 4 Nov 2021 14:20:07 +0000 (10:20 -0400)] 
protover: Add function to get the value of a single type

We can now query the protover subsystem to get the current value we
support for a specific protover type.

This will be useful for prop324 onion service part which puts in the
FlowCtrl value in the service descriptor.

No behavior change.

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoAdd test for congestion control negotiation logic.
Mike Perry [Tue, 23 Nov 2021 20:47:24 +0000 (20:47 +0000)] 
Add test for congestion control negotiation logic.

3 years agoAdd test for TAP vs ntor2+ntor3 onion queue ordering
Mike Perry [Tue, 23 Nov 2021 16:09:37 +0000 (16:09 +0000)] 
Add test for TAP vs ntor2+ntor3 onion queue ordering

3 years agoAdd hidden torrc option to always try CC negotiation.
Mike Perry [Tue, 16 Nov 2021 22:01:54 +0000 (22:01 +0000)] 
Add hidden torrc option to always try CC negotiation.

This is for public network testing and for sbws. Should not otherwise be used,
hence it is an undocumented __option.

The option deliberately does not allow force-disabling congestion control, as
this is bad for queueing and fairness.

3 years agoHandle other places that use onion handshake type values
Mike Perry [Fri, 5 Nov 2021 20:50:39 +0000 (20:50 +0000)] 
Handle other places that use onion handshake type values

We want ntor and ntorv3 to use the same queues and stats.

3 years agoExtend info argument updates for non-ntorv3 cases
Mike Perry [Thu, 4 Nov 2021 19:57:57 +0000 (19:57 +0000)] 
Extend info argument updates for non-ntorv3 cases

3 years agoCongestion control usage of negotiated params
Mike Perry [Thu, 4 Nov 2021 00:47:42 +0000 (00:47 +0000)] 
Congestion control usage of negotiated params

3 years agoProtover flag handling for congestion control negotiation
Mike Perry [Thu, 4 Nov 2021 00:47:19 +0000 (00:47 +0000)] 
Protover flag handling for congestion control negotiation

3 years agoHook up client usage of congestion control negotiation
Mike Perry [Thu, 4 Nov 2021 00:46:11 +0000 (00:46 +0000)] 
Hook up client usage of congestion control negotiation

3 years agoImplement congestion control parameter negotiation
Mike Perry [Thu, 4 Nov 2021 00:44:38 +0000 (00:44 +0000)] 
Implement congestion control parameter negotiation

3 years agoAdd circuit param payload definitions to trunnel
Mike Perry [Thu, 4 Nov 2021 00:01:33 +0000 (00:01 +0000)] 
Add circuit param payload definitions to trunnel

3 years agoConvert TODO into TODO-324 for better visibility.
Nick Mathewson [Tue, 14 Sep 2021 21:23:31 +0000 (17:23 -0400)] 
Convert TODO into TODO-324 for better visibility.

3 years agoAdd stub argument for constructing congestion_control_t
Nick Mathewson [Tue, 14 Sep 2021 21:13:05 +0000 (17:13 -0400)] 
Add stub argument for constructing congestion_control_t

3 years agoNegotiated circuit parameters must pass from worker.
Nick Mathewson [Tue, 14 Sep 2021 21:06:30 +0000 (17:06 -0400)] 
Negotiated circuit parameters must pass from worker.

3 years agoUse protover to signal support for ntor3 + congestion control.
Nick Mathewson [Tue, 14 Sep 2021 20:31:48 +0000 (16:31 -0400)] 
Use protover to signal support for ntor3 + congestion control.

3 years agoImplement core of ntor3 negotiation.
Nick Mathewson [Tue, 14 Sep 2021 19:01:45 +0000 (15:01 -0400)] 
Implement core of ntor3 negotiation.

There are a lot of TODOs about what to send, whom to send it to, and
etc.

3 years agoAdd an exported struct to onion handshakes for circuits params
Nick Mathewson [Tue, 14 Sep 2021 19:15:30 +0000 (15:15 -0400)] 
Add an exported struct to onion handshakes for circuits params

THis will eventually hold the congestion control parameters that we
negotiated, plus whatever else is relevant.

3 years agoAdd a size argument for the buffer on onion handshake functions
Nick Mathewson [Tue, 14 Sep 2021 18:19:22 +0000 (14:19 -0400)] 
Add a size argument for the buffer on onion handshake functions

3 years agoMerge branch 'tor-gitlab/mr/531'
David Goulet [Wed, 16 Feb 2022 18:59:37 +0000 (13:59 -0500)] 
Merge branch 'tor-gitlab/mr/531'

3 years agodirauth: Reject EOL 0.3.5.x relays
David Goulet [Mon, 14 Feb 2022 18:40:45 +0000 (13:40 -0500)] 
dirauth: Reject EOL 0.3.5.x relays

Closes #40559

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agodns: Do not trigger overload general on DNS timeout
David Goulet [Mon, 14 Feb 2022 18:20:53 +0000 (13:20 -0500)] 
dns: Do not trigger overload general on DNS timeout

This was missed in #40527 when the DNS timeout overload general signal
was removed.

Closes #40564

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoMerge branch 'tor-gitlab/mr/518'
David Goulet [Wed, 9 Feb 2022 15:36:26 +0000 (10:36 -0500)] 
Merge branch 'tor-gitlab/mr/518'

3 years agokist: Don't try to flush empty outbuf
David Goulet [Tue, 8 Feb 2022 14:31:17 +0000 (09:31 -0500)] 
kist: Don't try to flush empty outbuf

It is possible that a scheduled channel ended up with 0 bytes in its
outbuf after the scheduling loop and having an outbuf table entry
indicating that we need to flush bytes on the wire after the loop.

This lead to attempt to write 0 bytes up to the TLS layer that would
prevent such action.

All in all, this fixes wasted CPU cycles on attempting to flush nothing.

Fixes #40548

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agonss: Don't write empty payload on the wire
David Goulet [Tue, 8 Feb 2022 14:30:50 +0000 (09:30 -0500)] 
nss: Don't write empty payload on the wire

Part of #40548

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoAdd a changes file for exit notice redesign (40529)
Nick Mathewson [Mon, 7 Feb 2022 16:37:50 +0000 (11:37 -0500)] 
Add a changes file for exit notice redesign (40529)

3 years agoMerge remote-tracking branch 'tor-gitlab/mr/522'
Nick Mathewson [Mon, 7 Feb 2022 16:35:12 +0000 (11:35 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/522'

3 years agomakefile: New README.md file name
David Goulet [Mon, 7 Feb 2022 15:07:33 +0000 (10:07 -0500)] 
makefile: New README.md file name

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoreadme: Update and modernize with markdown
David Goulet [Mon, 7 Feb 2022 14:45:27 +0000 (09:45 -0500)] 
readme: Update and modernize with markdown

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoUse more stable Web Archive links
n_user [Sun, 6 Feb 2022 21:20:22 +0000 (21:20 +0000)] 
Use more stable Web Archive links

3 years agoRemove unmaintained versions from CI and scripts
David Goulet [Fri, 4 Feb 2022 18:00:56 +0000 (13:00 -0500)] 
Remove unmaintained versions from CI and scripts

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agochangelog: Forward port 0.4.5 and 0.4.6 ChangeLogs
David Goulet [Fri, 4 Feb 2022 17:54:42 +0000 (12:54 -0500)] 
changelog: Forward port 0.4.5 and 0.4.6 ChangeLogs

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 4 Feb 2022 17:36:40 +0000 (12:36 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoversion: Bump version to 0.4.6.10-dev
Tor CI Release [Fri, 4 Feb 2022 16:29:20 +0000 (16:29 +0000)] 
version: Bump version to 0.4.6.10-dev

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 4 Feb 2022 17:36:19 +0000 (12:36 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agoversion: Bump version to 0.4.5.12-dev
Tor CI Release [Fri, 4 Feb 2022 16:29:20 +0000 (16:29 +0000)] 
version: Bump version to 0.4.5.12-dev

3 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 4 Feb 2022 16:10:17 +0000 (11:10 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoversion: Bump version to 0.4.6.10
Tor CI Release [Fri, 4 Feb 2022 16:00:39 +0000 (16:00 +0000)] 
version: Bump version to 0.4.6.10

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 4 Feb 2022 16:09:38 +0000 (11:09 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agoversion: Bump version to 0.4.5.12
Tor CI Release [Fri, 4 Feb 2022 16:00:33 +0000 (16:00 +0000)] 
version: Bump version to 0.4.5.12

3 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 4 Feb 2022 16:07:34 +0000 (11:07 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 4 Feb 2022 16:07:34 +0000 (11:07 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agofallbackdir: Update list generated on February 04, 2022
Tor CI Release [Fri, 4 Feb 2022 15:49:03 +0000 (15:49 +0000)] 
fallbackdir: Update list generated on February 04, 2022

3 years agoUpdate geoip files to match ipfire location db, 2022/02/04.
Tor CI Release [Fri, 4 Feb 2022 15:46:27 +0000 (15:46 +0000)] 
Update geoip files to match ipfire location db, 2022/02/04.

3 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 4 Feb 2022 15:56:33 +0000 (10:56 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 4 Feb 2022 15:56:33 +0000 (10:56 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agoUpdate geoip files to match ipfire location db, 2021/12/15.
Tor CI Release [Wed, 15 Dec 2021 16:17:47 +0000 (16:17 +0000)] 
Update geoip files to match ipfire location db, 2021/12/15.

3 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 4 Feb 2022 15:18:26 +0000 (10:18 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 4 Feb 2022 15:18:25 +0000 (10:18 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agofallbackdir: Update list generated on December 15, 2021
Tor CI Release [Wed, 15 Dec 2021 16:29:45 +0000 (16:29 +0000)] 
fallbackdir: Update list generated on December 15, 2021

3 years agoUpdate unstable links to use Web Archive
n_user [Thu, 3 Feb 2022 14:34:31 +0000 (14:34 +0000)] 
Update unstable links to use Web Archive

3 years agochanges: Remove uneeded file due to empty merge forward
David Goulet [Thu, 3 Feb 2022 13:31:49 +0000 (08:31 -0500)] 
changes: Remove uneeded file due to empty merge forward

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoMerge branch 'maint-0.4.6'
David Goulet [Thu, 3 Feb 2022 13:30:59 +0000 (08:30 -0500)] 
Merge branch 'maint-0.4.6'

3 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Thu, 3 Feb 2022 13:30:40 +0000 (08:30 -0500)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

3 years agohs: Double quote the metrics label value
David Goulet [Wed, 2 Feb 2022 18:51:22 +0000 (13:51 -0500)] 
hs: Double quote the metrics label value

Fixes #40552

Signed-off-by: David Goulet <dgoulet@torproject.org>
3 years agoRedesign tor-exit-notice
n_user [Wed, 2 Feb 2022 00:33:22 +0000 (00:33 +0000)] 
Redesign tor-exit-notice

3 years agoMerge remote-tracking branch 'tor-gitlab/mr/506' into main
Alexander Færøy [Tue, 25 Jan 2022 21:53:30 +0000 (21:53 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/506' into main

3 years agoMerge remote-tracking branch 'tor-gitlab/mr/507' into main
Alexander Færøy [Tue, 25 Jan 2022 21:52:31 +0000 (21:52 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/507' into main

3 years agoMerge remote-tracking branch 'tor-gitlab/mr/513' into main
Alexander Færøy [Tue, 25 Jan 2022 21:42:44 +0000 (21:42 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/513' into main