29f07a4e9d
Merge branch 'mr/334'
2021-03-17 18:23:18 +02:00
0a5ecb3342
Implement backbone of overload statistics.
...
- Implement overload statistics structure.
- Implement function that keeps track of overload statistics.
- Implement function that writes overload statistics to descriptor.
- Unittest for the whole logic.
2021-03-17 18:22:38 +02:00
15a95df376
Merge branch 'tor-gitlab/mr/337'
2021-03-17 11:53:14 -04:00
066748c9cd
Add a DormantTimeoutEnabled to disable dormant mode entirely
...
(If you need to do this in an older version you can just set
DormantClientTimeout to something huge.)
Closes #40228 .
2021-03-17 11:53:09 -04:00
0ac03390e4
Merge branch 'maint-0.4.5'
2021-03-17 13:43:48 +02:00
59bbf8cde9
Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5
2021-03-17 13:43:38 +02:00
2022d974af
Fold ticket40314 into ChangeLog.
2021-03-15 09:35:56 -04:00
fcd42982b2
Remove changes files that will appear in 0.4.5.7
...
(0.4.6.1-alpha will come out after the stable releases.)
2021-03-15 09:03:37 -04:00
61731e3550
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 09:01:59 -04:00
3268403ba1
Merge branch 'maint-0.4.5'
2021-03-15 09:01:59 -04:00
5ec579610a
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 09:01:59 -04:00
f078aab71e
Merge branch 'bug40316_035_v2' into maint-0.3.5
2021-03-15 08:58:54 -04:00
890ae4fb1a
Fix detection of point to insert signatures on a pending consensus.
...
We were looking for the first instance of "directory-signature "
when instead the correct behavior is to look for the first instance
of "directory-signature " at the start of a line.
Unfortunately, this can be exploited as to crash authorities while
they're voting.
Fixes #40316 ; bugfix on 0.2.2.4-alpha. This is TROVE-2021-002,
also tracked as CVE-2021-28090.
2021-03-15 08:56:58 -04:00
a6533af9e8
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 08:54:00 -04:00
cfeb063f24
Merge branch 'maint-0.4.5'
2021-03-15 08:54:00 -04:00
2eb900f7e2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:54:00 -04:00
efca9ce41c
Clarify new intended strategy with TROVE-2021-001
...
We're going to disable this feature in all versions for now.
2021-03-15 08:53:36 -04:00
efb174df24
Merge branch 'maint-0.4.5'
2021-03-15 08:52:53 -04:00
7c5a67ccd9
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 08:52:29 -04:00
b9f6539008
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:52:28 -04:00
f46f4562cf
Merge branch 'bug40286_disable_min_035' into maint-0.3.5
2021-03-15 08:41:03 -04:00
433f526af6
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:36:34 -05:00
9f59b6f458
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:36:34 -05:00
6cc5613404
Merge branch 'maint-0.4.5'
2021-03-12 11:36:34 -05:00
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
b014866f6a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:30:22 -05:00
0b4a0c1a26
Merge branch 'maint-0.4.5'
2021-03-12 11:30:22 -05:00
41796158e6
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:30:21 -05:00
aa6c7741e8
update geoip-2021-03-12 to mention provider transition.
2021-03-12 11:29:09 -05:00
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -05:00
9131fe7eb2
Remove changes files already merged in release-0.4.5
2021-03-12 09:56:23 -05:00
7d9403b422
Merge remote-tracking branch 'tor-gitlab/mr/336'
2021-03-10 16:47:46 -05:00
f98dbdb069
Merge branch 'maint-0.4.5'
2021-03-10 15:28:14 -05:00
e8d224dfb1
Merge remote-tracking branch 'tor-gitlab/mr/335' into maint-0.4.5
2021-03-10 15:27:50 -05:00
d382f26914
Merge branch 'tor-gitlab/mr/331' into maint-0.4.5
2021-03-10 10:06:44 -05:00
6fce18916f
Merge branch 'tor-gitlab/mr/331'
2021-03-10 10:06:20 -05:00
fc080b4113
Merge branch 'maint-0.4.5'
2021-03-10 10:04:26 -05:00
9f9fed3fd1
vote: Add "stats" line
...
Closes #40314
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-03-10 09:51:30 -05:00
f93ccb8d24
hs: Remove hamrless BUG() that can happen
...
When reloading a service, we can re-register a service and thus end up again
in the metrics store initialization code path which is fine. No need to BUG()
anymore.
Fixes #40334
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-03-10 09:12:29 -05:00
05564a8521
Start a changelog for 0.4.6.1-alpha
2021-03-09 11:58:46 -05:00
4f138f2ed2
Remove changes files that are already merged in 0.4.5.x
2021-03-09 11:44:54 -05:00
9409c7f2f5
Don't warn about missing guard state if controller picked first hop
...
See comments about why this needs a new flag and we can't just use
CIRCUIT_PURPOSE_CONTROLLER.
Fixes #40285 ; bugfix on 0.3.2.1-alpha.
2021-03-08 13:42:43 -05:00
b599f489ae
Fix documentation formatting for VirtualAddrNetworkIPv6
...
Fixes bug #40256 ; bugfix on 0.2.9.4-alpha.
2021-03-08 11:17:24 -05:00
690c7be253
Fix parsing bug in linux get_total_system_memory().
...
Use find_str_at_start_of_line(), not strstr() here: we don't want
to match "MemTotal: " if it appears in the middle of a line.
Fixes #40315 ; bugfix on 0.2.5.4-alpha.
2021-03-03 14:52:15 -05:00
80b6054bb0
Merge remote-tracking branch 'tor-gitlab/mr/213'
2021-03-03 15:16:20 +00:00
f75baf5ea5
Merge branch 'maint-0.4.5'
2021-02-24 13:55:30 -05:00
6ea7eb58c6
Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
2021-02-24 13:55:21 -05:00
830b0f8c62
Merge remote-tracking branch 'tor-gitlab/mr/306'
2021-02-24 12:35:55 +02:00
6edb648aa0
Merge branch 'maint-0.4.5'
2021-02-23 12:28:04 -05:00
97e51dd01b
Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
2021-02-23 12:27:59 -05:00
George Kadianakis
David Goulet
Nick Mathewson
Alexander Færøy