aa49562a05
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-16 09:18:52 -04:00
d66178c7b7
Bump version to 0.4.5.7-dev
2021-03-16 09:18:27 -04:00
e2dd8f1532
Merge branch 'maint-0.4.4' into maint-0.4.5
...
"ours" to avoid version bump.
2021-03-16 09:18:06 -04:00
94fb308c5d
Bump version to 0.4.4.8-dev
2021-03-16 09:17:56 -04:00
5fac24053d
Merge branch 'maint-0.3.5' into maint-0.4.4
...
"ours" to avoid version bump.
2021-03-16 09:17:40 -04:00
3271c0bde7
Bump to 0.3.5.14-dev
2021-03-16 09:17:31 -04:00
83f895c015
copy 0.4.5.7 changelog to releasenotes
2021-03-16 08:27:52 -04:00
bc2e3ea89d
changelog updates from arma
2021-03-15 17:12:55 -04:00
7c00afe0fb
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 09:41:38 -04:00
5a26949609
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-15 09:41:38 -04:00
f2cfd1ffad
Remove check-best-practices from check-local in 0.4.4
2021-03-15 09:41:19 -04:00
066de45209
Changelog for 0.4.5.7
2021-03-15 09:22:06 -04:00
61731e3550
Merge branch 'maint-0.4.4' into 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
33d1e45a68
Merge branch 'maint-0.4.5' into release-0.4.5
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
2eb900f7e2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:54:00 -04:00
9c63b3b0c2
Merge branch 'maint-0.4.5' into release-0.4.5
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
7c5a67ccd9
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 08:52:29 -04:00
1fdfa8eeed
Merge branch 'maint-0.4.5' into release-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
849fde27fe
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-15 07:42:55 -04:00
be17a5a3cf
Bump to 0.4.5.7
2021-03-15 07:41:54 -04:00
5e771327af
Merge branch 'maint-0.4.4' into maint-0.4.5
...
"ours" to avoid version bump.
2021-03-15 07:40:56 -04:00
fb2c889a38
Bump to 0.4.4.8
2021-03-15 07:40:48 -04:00
8ada4263a9
Merge branch 'maint-0.3.5' into maint-0.4.4
...
"ours" to avoid version bump.
2021-03-15 07:40:06 -04:00
1a0b5fd569
Bump to 0.3.5.14
2021-03-15 07:39:45 -04:00
61c6049fa8
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-12 11:36:34 -05: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
02230575c4
Remove maxmind license; add ipfire location database license (cc by-sa 4.0)
2021-03-12 11:36:28 -05:00
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
b5c565728e
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-12 11:30:22 -05:00
b014866f6a
Merge branch 'maint-0.4.4' into 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
35cba3ae33
Merge branch 'maint-0.4.5' into release-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
8c4581865e
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-10 10:06:48 -05:00
d382f26914
Merge branch 'tor-gitlab/mr/331' into maint-0.4.5
2021-03-10 10:06:44 -05:00
c1b43d79eb
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-10 10:04:26 -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
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
fa06aaf7d7
Merge branch 'maint-0.4.5' into release-0.4.5
2021-03-01 08:33:47 -05:00
Nick Mathewson
David Goulet