Nick Mathewson
f6af8e2021
Merge branch 'maint-0.4.5'
2021-03-24 12:25:05 -04:00
Nick Mathewson
c359c3056b
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-24 12:25:05 -04:00
Nick Mathewson
37b16d7e19
Merge remote-tracking branch 'tor-gitlab/mr/339'
2021-03-24 12:23:30 -04:00
George Kadianakis
f1c673fa54
Merge remote-tracking branch 'tor-gitlab/mr/343'
2021-03-24 13:17:27 +02:00
David Goulet
0cf3ab54f6
Merge branch 'tor-gitlab/mr/337'
2021-03-23 09:42:21 -04:00
Nick Mathewson
08a1b4d6b1
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-23 09:40:58 -04:00
David Goulet
9ca2394d6b
channel: Fix use after free in channel_do_open_actions()
...
Fortunately, our tor_free() is setting the variable to NULL after so we were
in a situation where NULL was always used instead of the transport name.
This first appeared in 894ff2dc84
and results in
basically no bridge with a transport being able to use DoS defenses.
Fixes #40345
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-23 09:19:41 -04:00
David Goulet
3a2593710b
man: HiddenServiceStatistics applies for bridges
...
Closes #40346
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-23 08:32:26 -04:00
Nick Mathewson
5c7f9844e4
manpage:Move BridgeRecordUsageByCountry to statistics section
...
patch from cypherpunks; closes #40323
2021-03-22 14:09:22 -04:00
Nick Mathewson
0229d5f818
Add "Heartbeat" to the start of several heartbeat messages.
...
Closes #40322 .
2021-03-19 13:33:56 -04:00
Nick Mathewson
2dfa19a871
Move ServerTransport* options to 'Server Options' section.
...
Patch from 'cypherpunks'. Closes #40331 .
2021-03-19 13:23:29 -04:00
Nick Mathewson
ded8f9b378
Fold new entries into 0.4.6.1-alpha ChangeLog
2021-03-18 09:51:37 -04:00
Roger Dingledine
6de09642f0
warn and reject reentering streams at client too
...
Clients now check whether their streams are attempting to re-enter
the Tor network (i.e. to send Tor traffic over Tor), and they close
them preemptively if they think exit relays will refuse them.
See bug 2667 for details. Resolves ticket 40271.
2021-03-17 13:04:23 -04:00
George Kadianakis
29f07a4e9d
Merge branch 'mr/334'
2021-03-17 18:23:18 +02:00
George Kadianakis
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
David Goulet
15a95df376
Merge branch 'tor-gitlab/mr/337'
2021-03-17 11:53:14 -04:00
Nick Mathewson
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
George Kadianakis
0ac03390e4
Merge branch 'maint-0.4.5'
2021-03-17 13:43:48 +02:00
George Kadianakis
59bbf8cde9
Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5
2021-03-17 13:43:38 +02:00
Nick Mathewson
2022d974af
Fold ticket40314 into ChangeLog.
2021-03-15 09:35:56 -04:00
Nick Mathewson
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
Nick Mathewson
61731e3550
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 09:01:59 -04:00
Nick Mathewson
5ec579610a
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 09:01:59 -04:00
Nick Mathewson
3268403ba1
Merge branch 'maint-0.4.5'
2021-03-15 09:01:59 -04:00
Nick Mathewson
f078aab71e
Merge branch 'bug40316_035_v2' into maint-0.3.5
2021-03-15 08:58:54 -04:00
Nick Mathewson
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
Nick Mathewson
a6533af9e8
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 08:54:00 -04:00
Nick Mathewson
2eb900f7e2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:54:00 -04:00
Nick Mathewson
cfeb063f24
Merge branch 'maint-0.4.5'
2021-03-15 08:54:00 -04:00
Nick Mathewson
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
Nick Mathewson
efb174df24
Merge branch 'maint-0.4.5'
2021-03-15 08:52:53 -04:00
Nick Mathewson
7c5a67ccd9
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-15 08:52:29 -04:00
Nick Mathewson
b9f6539008
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:52:28 -04:00
Nick Mathewson
f46f4562cf
Merge branch 'bug40286_disable_min_035' into maint-0.3.5
2021-03-15 08:41:03 -04:00
Nick Mathewson
433f526af6
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:36:34 -05:00
Nick Mathewson
9f59b6f458
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:36:34 -05:00
Nick Mathewson
6cc5613404
Merge branch 'maint-0.4.5'
2021-03-12 11:36:34 -05:00
Nick Mathewson
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
Nick Mathewson
b014866f6a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:30:22 -05:00
Nick Mathewson
0b4a0c1a26
Merge branch 'maint-0.4.5'
2021-03-12 11:30:22 -05:00
Nick Mathewson
41796158e6
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:30:21 -05:00
Nick Mathewson
aa6c7741e8
update geoip-2021-03-12 to mention provider transition.
2021-03-12 11:29:09 -05:00
Nick Mathewson
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -05:00
Nick Mathewson
9131fe7eb2
Remove changes files already merged in release-0.4.5
2021-03-12 09:56:23 -05:00
Nick Mathewson
7d9403b422
Merge remote-tracking branch 'tor-gitlab/mr/336'
2021-03-10 16:47:46 -05:00
Nick Mathewson
f98dbdb069
Merge branch 'maint-0.4.5'
2021-03-10 15:28:14 -05:00
Nick Mathewson
e8d224dfb1
Merge remote-tracking branch 'tor-gitlab/mr/335' into maint-0.4.5
2021-03-10 15:27:50 -05:00
David Goulet
d382f26914
Merge branch 'tor-gitlab/mr/331' into maint-0.4.5
2021-03-10 10:06:44 -05:00
David Goulet
6fce18916f
Merge branch 'tor-gitlab/mr/331'
2021-03-10 10:06:20 -05:00
David Goulet
fc080b4113
Merge branch 'maint-0.4.5'
2021-03-10 10:04:26 -05:00