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
2ae24d003d
Add a MinTimeToReportBandwidth option; make it 0 for testing networks.
...
This option changes the time for which a bandwidth measurement period
must have been in progress before we include it when reporting our
observed bandwidth in our descriptors. Without this option, we only
consider a time period towards our maximum if it has been running
for a full day. Obviously, that's unacceptable for testing
networks, where we'd like to get results as soon as possible.
For non-testing networks, I've put a (somewhat arbitrary) 2-hour
minimum on the option, since there are traffic analysis concerns
with immediate reporting here.
Closes #40337 .
2021-03-17 08:45:37 -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
d66178c7b7
Bump version to 0.4.5.7-dev
2021-03-16 09:18:27 -04:00
94fb308c5d
Bump version to 0.4.4.8-dev
2021-03-16 09:17:56 -04:00
3271c0bde7
Bump to 0.3.5.14-dev
2021-03-16 09:17:31 -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
3268403ba1
Merge branch 'maint-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
cfeb063f24
Merge branch 'maint-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
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
8e4965aa36
Bump to 0.4.6.1-alpha
2021-03-15 07:42:47 -04:00
be17a5a3cf
Bump to 0.4.5.7
2021-03-15 07:41:54 -04:00
fb2c889a38
Bump to 0.4.4.8
2021-03-15 07:40:48 -04:00
1a0b5fd569
Bump to 0.3.5.14
2021-03-15 07:39:45 -04:00
444233c15e
Run "make autostyle" in advance of new series.
2021-03-12 11:40:48 -05:00
b5d08ddc09
Update copyrights to 2021, using "make update-copyright"
2021-03-12 11:39:23 -05:00
d7e827a754
Remove MMDB conversion tool.
...
It was made to convert Maxmind's "mmdb" files into the older format
that we used. But now thanks to IPFire Location, we don't have to
touch Maxmind formats any more. (See ticket #40224.)
2021-03-12 11:37:03 -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
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -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
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
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
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
2eb015372b
Merge branch 'tor-gitlab/mr/328'
2021-03-01 08:36:02 -05:00
1b36e50fdd
Correct documentation for lib_meminfo.md
2021-03-01 08:13:32 -05:00
a497a97e4c
Change %lu to %TOR_PRIuSZ in dos.c.
...
This patch unbreaks the Windows build on master that was introduced in
99703eaca0
2021-02-26 18:16:08 +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
ad4f87ed3f
Remove mallinfo() from codebase
...
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-23 12:16:58 -05:00
296a557bfc
Remove mallinfo() from codebase
...
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-23 11:02:33 -05:00
Nick Mathewson
George Kadianakis
David Goulet
Alexander Færøy