torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,052 Commits 53 Branches 631 Tags
b256d83c3ea8a417ddaa896ede6d4a1ceaa3fab7
Commit Graph

36052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet b256d83c3e Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:46:31 -05:00
David Goulet ea38016202 Merge branch 'maint-0.4.3' into maint-0.4.4 2021-01-28 12:46:31 -05:00
David Goulet 79cb47cfc2 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:46:31 -05:00
David Goulet 9556276f07 Merge branch 'tor-gitlab/mr/50' into maint-0.3.5 2021-01-28 12:46:24 -05:00
David Goulet 61d66c8cb5 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:42:32 -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 6999a05008 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:36:42 -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 09abca6f9c Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:14:10 -05:00
David Goulet 2c4a2a93d3 Merge branch 'maint-0.4.3' into maint-0.4.4 2021-01-28 12:14:10 -05:00
David Goulet dd5fbc1bd9 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:14:10 -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 3e9cdf8b5a Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:08:21 -05:00
David Goulet ed0fcfd2b8 Merge branch 'maint-0.4.3' into maint-0.4.4 2021-01-28 12:08:21 -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 c0f4211626 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:04:42 -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
David Goulet c3e46fe931 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:02:43 -05:00
David Goulet 07540e2a18 Merge branch 'maint-0.4.3' into maint-0.4.4 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 7178b59b21 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 12:00:17 -05:00
David Goulet bf29d3b4ae Merge branch 'maint-0.4.3' into maint-0.4.4 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 637d7c25df Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-28 11:20:20 -05:00
Nick Mathewson f8fea8b979 Bump to 0.4.4.7 2021-01-28 11:19:00 -05:00
Nick Mathewson bcb8afe38e Merge branch 'maint-0.4.3' into maint-0.4.4 
"ours" to avoid version bump.
 2021-01-28 11:18:30 -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 5a131c35ee Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-21 16:18:43 -05:00
David Goulet 09a1a34ad1 Merge branch 'maint-0.4.3' into maint-0.4.4 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 5110b15cee Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-21 16:06:54 -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
Nick Mathewson a221f11483 Merge branch 'maint-0.4.4' into release-0.4.4 2021-01-19 12:53:52 -05:00
Nick Mathewson d54cd853ad Merge branch 'maint-0.4.3' into maint-0.4.4 2021-01-19 12:53:52 -05:00