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
35,747 Commits 53 Branches 631 Tags
26b257757bf0e97da17c5e00ada166fdf2b68875
Commit Graph

35747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 26b257757b Bump to 0.4.4.4-rc-dev 2020-08-13 09:43:54 -04:00
Nick Mathewson 9d77ed7be2 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 20:21:04 -04:00
Nick Mathewson 34919368ce Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 20:21:04 -04:00
Nick Mathewson 07f0210a05 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 20:21:04 -04:00
Nick Mathewson aeafb7f44f Improve comments in .gitlab-ci.yml 2020-08-12 20:20:58 -04:00
Nick Mathewson 41a7ab96e5 CI: Turn on stem with 044 and later. 2020-08-12 20:13:18 -04:00
Nick Mathewson f98b1988ec Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 12:29:17 -04:00
Nick Mathewson 309eafbc3c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 12:29:17 -04:00
Nick Mathewson 02bb719a94 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 12:29:17 -04:00
Nick Mathewson f5b9471547 CI: improve output when skipping doxygen 2020-08-12 12:28:44 -04:00
Nick Mathewson 50b7bd243f Try disabling "make all" when checking docs. 2020-08-12 12:28:44 -04:00
Nick Mathewson fe0e62ddc4 CI: Try to enable integration tests, hardening, and clang. 2020-08-12 11:29:46 -04:00
Nick Mathewson 670f5632a5 Merge branch 'maint-0.4.3' into maint-0.4.4 
"ours" merge to avoid MR 122 -- we already merged MR 123.
 2020-08-12 08:40:10 -04:00
Nick Mathewson 489d33e190 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 08:39:41 -04:00
Nick Mathewson 6ef40144ae Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 08:39:41 -04:00
George Kadianakis 537be1da33 CI: Remove VS2015 AppVeyor build 2020-08-12 14:09:32 +03:00
George Kadianakis 8182f1351a CI: Remove VS2015 AppVeyor build. 2020-08-12 14:05:21 +03:00
George Kadianakis 5a1918d7e7 Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4 2020-08-12 13:47:34 +03:00
George Kadianakis 8e9edb93be Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4 2020-08-12 13:23:08 +03:00
Nick Mathewson 1770d1c216 bump version to 0.4.4.4-rc 2020-08-11 17:46:44 -04:00
Nick Mathewson d76f8457f3 Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4 2020-08-11 12:40:02 -04:00
Nick Mathewson 0ec2d1528c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 12:37:08 -04:00
Nick Mathewson c6c0af403c Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 12:37:08 -04:00
Nick Mathewson 2b968446d9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 12:37:08 -04:00
Nick Mathewson adb7268236 CI: label our python versions. 2020-08-11 12:24:03 -04:00
Nick Mathewson 9eb316de42 CI: Only run doxygen on 0.4.3 and later. 2020-08-11 12:22:35 -04:00
Nick Mathewson 6a91a50d32 CI: enable documentation testing 2020-08-11 11:06:49 -04:00
Nick Mathewson 6bee9bd481 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 11:03:24 -04:00
Nick Mathewson da8577bb75 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 11:03:24 -04:00
Nick Mathewson 673d02bdb0 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 11:03:24 -04:00
Nick Mathewson aa2c93b90b Fix a pair of typos in ci-driver.sh. 2020-08-11 11:03:11 -04:00
Nick Mathewson 2a7e71c956 Fix "run_check_subsystem_order.sh" to use $PYTHON. 
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.

Fixes bug 40095; bugfix on 0.4.4.1-alpha.
 2020-08-11 11:01:31 -04:00
Nick Mathewson 262ddfee7a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 10:44:40 -04:00
Nick Mathewson e4a6d9d5a9 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 10:44:40 -04:00
Nick Mathewson d83703317d Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 10:44:40 -04:00
Nick Mathewson 8a0f530adf Add a pair of warnings about only editing CI in 035 2020-08-11 10:44:32 -04:00
George Kadianakis ab9c35f043 Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4 2020-08-11 14:53:03 +03:00
George Kadianakis 9316ca9f06 Remove a BUG() that could normally trigger in edge-cases. 2020-08-11 14:42:18 +03:00
Nick Mathewson 7d80bf80fe Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-10 19:33:07 -04:00
Nick Mathewson f3fcc89d05 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-10 19:33:06 -04:00
Nick Mathewson 68f8250cbb Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-10 19:32:49 -04:00
Nick Mathewson e873c7e893 small code tweaks to try to work around debian stable complaints 2020-08-10 19:20:05 -04:00
Nick Mathewson 057f40f3d8 Try to set up a minimal gitlab CI script 
This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.
 2020-08-10 19:20:05 -04:00
Nick Mathewson cb027b392f Add a shareable continuous-integration script. 
Eventually this should be used by every one of our CI scripts.
 2020-08-10 19:01:05 -04:00
Nick Mathewson c1b440f760 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-06 13:24:12 -04:00
Nick Mathewson 39d5e7c764 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-06 13:24:11 -04:00
Nick Mathewson 352991c843 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-06 13:24:11 -04:00
Nick Mathewson bac8967e24 Copy from master gitlab-ci.yml from master back to maint-0.3.5 2020-08-06 12:42:14 -04:00
Nick Mathewson 08de260682 Merge branch 'bug40083_035' into bug40083_042 
Fixes conflicts due to code movement.
 2020-08-04 13:10:16 -04:00
Nick Mathewson 62361cc698 Launch early reachability tests once a minute, not once a second. 
This fixes bug 40083, which was introduced in 9f31908a in
0.2.8.1-alpha.
 2020-08-04 13:05:07 -04:00