877f7bbb47
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-12 11:30:21 -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
34ad10db54
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-01 08:33:47 -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
49c61c1bb8
Delete changes/40241_v2 as it breaks CI.
...
Unreviewed build fix. Discussed the cnage on IRC with Nick.
2021-02-05 19:18:13 +00:00
37a32b7ee7
Fold in the entry for 2667
2021-02-03 09:53:47 -05:00
3e618aae1a
Merge branch 'maint-0.4.4' into release-0.4.4
2021-02-03 08:44:19 -05:00
6d8f6d5b0a
Start a changelog for 0.4.4.7
2021-02-02 15:54:33 -05:00
b2434d30d2
Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
2021-01-29 14:54:21 -05:00
705fd37875
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
2021-01-29 14:51:38 -05:00
93ac6ec4d3
exit: Deny re-entry into the network
...
Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.
Closes #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
b256d83c3e
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:46:31 -05:00
ea38016202
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:46:31 -05:00
79cb47cfc2
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:46:31 -05:00
9556276f07
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5
2021-01-28 12:46:24 -05:00
61d66c8cb5
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:42:32 -05:00
be81ecba3a
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:42:31 -05:00
f058db1f3d
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:42:31 -05:00
290007e3c4
Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
2021-01-28 12:42:26 -05:00
6999a05008
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:36:42 -05:00
a3f2bc8f13
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:36:42 -05:00
f3da5f88d7
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:36:42 -05:00
02bd135cb1
Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
2021-01-28 12:36:35 -05:00
09abca6f9c
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:14:10 -05:00
1887231afb
Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
2021-01-28 12:12:01 -05:00
5c89197c9f
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
2021-01-28 12:11:33 -05:00
1bdccc03a9
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
2021-01-28 12:10:39 -05:00
6186288eb6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:08:20 -05:00
045db909c2
Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5
2021-01-28 12:08:14 -05:00
737cd79c42
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:04:42 -05:00
a17be1b5b6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:04:42 -05:00
c6fb26695b
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:04:37 -05:00
7178b59b21
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:00:17 -05:00
bf29d3b4ae
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:00:17 -05:00
7ae74203e1
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:00:17 -05:00
2cf1365c17
Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:00:10 -05:00
5110b15cee
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-21 16:06:54 -05:00
2a3cf37450
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-21 16:06:54 -05:00
c09f8da8a9
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-21 16:06:54 -05:00
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
b7f886beb4
Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
2021-01-19 12:53:44 -05:00
faf7b550e7
Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
2021-01-19 12:53:30 -05:00
428d5eea11
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-19 12:49:30 -05:00
4c82c2d1d4
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-19 12:49:22 -05:00
a22bfe04bc
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-19 12:45:07 -05:00
fa8ecf8820
Better fix for #40241 (--enable-all-bugs-are-fatal and fallthrough)
...
This one should work on GCC _and_ on Clang. The previous version
made Clang happier by not having unreachable "fallthrough"
statements, but made GCC sad because GCC didn't think that the
unconditional failures were really unconditional, and therefore
_wanted_ a FALLTHROUGH.
This patch adds a FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL macro that
seems to please both GCC and Clang in this case: ordinarily it is a
FALLTHROUGH, but when ALL_BUGS_ARE_FATAL is defined, it's an
abort().
Fixes bug 40241 again. Bugfix on earlier fix for 40241, which was
merged into maint-0.3.5 and forward, and released in 0.4.5.3-rc.
2021-01-13 09:54:43 -05:00
b3652f2104
Merge branch 'ticket40237_043_01' into ticket40237_044_01
2021-01-12 10:54:31 -05:00
Nick Mathewson
David Goulet
Alexander Færøy
Roger Dingledine