David Goulet
9556276f07
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5
2021-01-28 12:46:24 -05:00
David Goulet
be81ecba3a
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:42:31 -05:00
David Goulet
f058db1f3d
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:42:31 -05:00
David Goulet
290007e3c4
Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
2021-01-28 12:42:26 -05:00
David Goulet
a3f2bc8f13
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:36:42 -05:00
David Goulet
f3da5f88d7
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:36:42 -05:00
David Goulet
02bd135cb1
Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
2021-01-28 12:36:35 -05:00
David Goulet
1887231afb
Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
2021-01-28 12:12:01 -05:00
David Goulet
5c89197c9f
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
2021-01-28 12:11:33 -05:00
David Goulet
1bdccc03a9
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
2021-01-28 12:10:39 -05:00
David Goulet
6186288eb6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:08:20 -05:00
David Goulet
045db909c2
Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5
2021-01-28 12:08:14 -05:00
David Goulet
737cd79c42
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:04:42 -05:00
David Goulet
a17be1b5b6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:04:42 -05:00
David Goulet
c6fb26695b
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:04:37 -05:00
Neel Chauhan
a82b4eb305
src/core/mainloop: Put brackets around IPv6 addresses in log messages
2021-01-27 08:23:39 -08:00
David Goulet
a634f6b64c
dos: Move config options within the subsystem
...
Closes #40261
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-27 10:37:36 -05:00
Nick Mathewson
b019c83853
Merge branch 'maint-0.4.5'
2021-01-27 09:36:39 -05:00
David Goulet
2e600019ea
relay: Don't trigger an address discovery without an ORPort
...
We would before do an address discovery and then a lookup in the cache if not
found which is now simplified by calling relay_find_addr_to_publish() directly
which does all those combined.
Furthermore, by doing so, we won't trigger an address discovery every minute
if we have no ORPort configured for the family.
Fixes #40254
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-27 09:36:17 -05:00
George Kadianakis
dbbd603313
Merge remote-tracking branch 'tor-gitlab/mr/248'
2021-01-27 15:43:01 +02:00
George Kadianakis
a7ca089343
Merge remote-tracking branch 'tor-gitlab/mr/247'
2021-01-27 15:39:29 +02:00
Nick Mathewson
930a17f347
Remove changes files for entries that have appeared in an 045 changelog.
2021-01-22 15:25:04 -05:00
George Kadianakis
74cfe3611f
Merge branch 'maint-0.4.5'
2021-01-22 00:21:21 +02:00
George Kadianakis
4cbd22f1a7
Merge branch 'mr/251' into maint-0.4.5
2021-01-22 00:21:09 +02:00
George Kadianakis
5d711450dd
Changes file for #40238 .
2021-01-21 23:17:31 +02:00
David Goulet
e06a0e904c
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-01-21 16:07:16 -05:00
David Goulet
2a3cf37450
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-21 16:06:54 -05:00
David Goulet
c09f8da8a9
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-21 16:06:54 -05:00
David Goulet
8500700aa4
build: Add "make lsp" command
...
Generates the compile_commands.json file using the "bear" application so the
ccls server can be more efficient with our code base.
Closes #40227
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-21 16:06:31 -05:00
David Goulet
9be33755ef
Merge branch 'maint-0.4.5'
2021-01-21 14:58:39 -05:00
David Goulet
c54f4b81da
Merge branch 'tor-gitlab/mr/270' into maint-0.4.5
2021-01-21 14:58:31 -05:00
Roger Dingledine
633b68bfe2
log more during consensus voting process
...
Give more visibility to directory authority operators during the consensus
voting process.
Closes ticket 40245.
2021-01-21 13:46:56 -05:00
Nick Mathewson
b2536c97f9
Merge branch 'maint-0.4.5'
2021-01-21 13:40:46 -05:00
Nick Mathewson
08c0ef61d8
fix changes file
2021-01-21 13:39:40 -05:00
Nick Mathewson
3d952b461d
Merge remote-tracking branch 'tor-gitlab/mr/269' into maint-0.4.5
2021-01-21 13:37:21 -05:00
Nick Mathewson
2243fc3ad1
Merge branch 'maint-0.4.5'
2021-01-21 13:19:49 -05:00
Nick Mathewson
9390e2bf83
Merge remote-tracking branch 'tor-gitlab/mr/268' into maint-0.4.5
2021-01-21 13:10:16 -05:00
David Goulet
8a27860720
Merge branch 'maint-0.4.5'
2021-01-21 12:27:34 -05:00
David Goulet
7b102d53e3
Merge branch 'tor-gitlab/mr/265' into maint-0.4.5
2021-01-21 12:27:27 -05:00
David Goulet
2c4355fcec
changes: Align text in bug40236
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-20 16:26:28 -05:00
David Goulet
61803775e8
Merge branch 'tor-gitlab/mr/264'
2021-01-20 16:22:36 -05:00
David Goulet
7692f443d4
config: Remove Bridge <-> ClientTransportPlugin validation
...
This validation was only done if DisableNetwork was off because we would use
the global list of transports/bridges and DisableNetwork would not populate
it.
This was a problem for any user using DisableNetwork which includes Tor
Browser and thus leading to the Bug() warning.
Without a more in depth refactoring, we can't do this validation without the
global list.
The previous commit makes it that any connection to a bridge without a
transport won't happen thus we keep the security feature of not connecting to
a bridge without its corresponding transport.
Related to #40106
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-20 15:56:19 -05:00
Alexander Færøy
c38c36e5f1
Limit the number of items in the consdiffmgr on Windows.
...
This patch limits the number of items in the consensus diff cache to 64
on the Windows platform. Hopefully, this will allow us to investigate a
smarter fix while avoiding the situation reported in tor#24857 where
Windows relay operators report Tor using 100% CPU.
See: tor#24857
2021-01-20 16:33:17 +00:00
Nick Mathewson
b0af4ddc7c
Merge branch 'maint-0.4.5'
2021-01-19 13:20:43 -05:00
Nick Mathewson
27ee12836d
Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5
2021-01-19 13:20:31 -05:00
Nick Mathewson
b7f886beb4
Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
2021-01-19 12:53:44 -05:00
Nick Mathewson
faf7b550e7
Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
2021-01-19 12:53:30 -05:00
Nick Mathewson
5f53e013cd
Merge branch 'maint-0.4.5'
2021-01-19 12:49:31 -05:00
Nick Mathewson
6c1bc570cf
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-01-19 12:49:31 -05:00
Nick Mathewson
4c82c2d1d4
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-19 12:49:22 -05:00
