David Goulet
ee14fae8a7
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-28 12:02:43 -05:00
David Goulet
ab58dd1577
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:02:43 -05:00
David Goulet
8f13257ccd
Merge branch 'tor-gitlab/mr/140' into maint-0.3.5
2021-01-28 12:02:39 -05:00
David Goulet
7d4049fa9e
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-28 12:00:17 -05:00
David Goulet
7ae74203e1
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:00:17 -05:00
David Goulet
2cf1365c17
Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:00:10 -05:00
Nick Mathewson
ac005aacf5
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-28 11:20:20 -05:00
Nick Mathewson
c3ed4b2e56
Bump to 0.4.3.8.
2021-01-28 11:18:13 -05:00
Nick Mathewson
7ed0fbd885
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2021-01-28 11:17:43 -05:00
Nick Mathewson
3ebf75993f
Bump to 0.3.5.13.
2021-01-28 11:17:32 -05:00
David Goulet
c3987a66c9
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-21 16:18:43 -05:00
David Goulet
641dce2d6b
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-21 16:18:43 -05:00
Alex Xu (Hello71)
65087903d9
gitignore: don't ignore core directory
...
otherwise src/core is ignored.
2021-01-21 16:18:22 -05:00
David Goulet
ab75eef8dd
Merge branch 'maint-0.4.3' into release-0.4.3
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
Nick Mathewson
1cd6baad7e
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-19 12:53:52 -05:00
Nick Mathewson
9b390a556e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-19 12:53:52 -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
742d18e047
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-19 12:45:07 -05:00
Nick Mathewson
a22bfe04bc
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-19 12:45:07 -05:00
Nick Mathewson
2d5b21598e
Merge remote-tracking branch 'tor-gitlab/mr/259' into maint-0.3.5
2021-01-19 12:44:59 -05:00
David Goulet
558dce9cef
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-13 10:38:05 -05:00
David Goulet
17eb635532
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-13 10:38:05 -05:00
David Goulet
7a82fbfdab
gitignore: Add Linux core file patterns
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-13 10:37:56 -05:00
Nick Mathewson
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
Nick Mathewson
33f14fc6d3
Merge branch 'maint-0.4.3' into release-0.4.3
2021-01-11 14:37:29 -05:00
Nick Mathewson
4b39f46a61
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-11 14:37:28 -05:00
Nick Mathewson
6c0f15500b
Merge branch 'ticket40241_035' into maint-0.3.5
2021-01-11 14:37:14 -05:00
Nick Mathewson
ccdbbae4ec
Fix warnings in current debian-hardened CI.
...
We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.
Fixes bug 40241. Bugfix on 0.3.5.4-alpha.
2021-01-11 14:25:56 -05:00
Alexander Færøy
9b654b95ec
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-19 17:43:59 +00:00
Alexander Færøy
2e7cbd7a9c
Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3
2020-11-19 17:43:44 +00:00
Nick Mathewson
a211f54749
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-16 22:42:22 -05:00
Nick Mathewson
7c0778ef7e
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-11-16 22:42:22 -05:00
Nick Mathewson
fcae26adf7
Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5
2020-11-16 22:42:15 -05:00
Nick Mathewson
be356d80fe
Correct EOL date for 0.4.3.x
2020-11-12 09:42:47 -05:00
Nick Mathewson
ded1695a66
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-12 08:13:37 -05:00
Nick Mathewson
fd22fa183b
Bump to 0.4.3.7-dev
2020-11-12 08:12:11 -05:00
Nick Mathewson
1fa90a2077
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2020-11-12 08:11:20 -05:00
Nick Mathewson
862c44e4ec
Bump to 0.3.5.12-dev
2020-11-12 08:11:01 -05:00
Nick Mathewson
26465179fa
Copy 0.4.3.7 changelog to releasenotes
2020-11-12 07:35:53 -05:00
Nick Mathewson
c142045be2
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-09 17:14:58 -05:00
Nick Mathewson
3d3dc08ed8
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"-s ours" to avoid version bump.
2020-11-09 17:13:25 -05:00
Nick Mathewson
6338c35e9d
Bump to 0.4.3.7
2020-11-09 17:12:41 -05:00
Nick Mathewson
665083be9f
Bump to 0.3.5.12
2020-11-09 17:12:18 -05:00
Nick Mathewson
328078c3a0
changelog for 0.4.3.7
2020-11-09 16:58:18 -05:00
Nick Mathewson
4234a9d819
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-09 16:13:43 -05:00
Nick Mathewson
0b2c64effd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-11-09 16:13:42 -05:00
Nick Mathewson
52e439c13e
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
2020-11-09 16:13:24 -05:00
