Commit Graph

36257 Commits

Author SHA1 Message Date
Nick Mathewson
8669ace2fb Merge branch 'maint-0.4.4' 2020-08-13 14:20:39 -04:00
Nick Mathewson
ef18fb56c9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-13 14:20:39 -04:00
Nick Mathewson
7915b651d9 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-13 14:20:39 -04:00
Nick Mathewson
45d9830493 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-13 14:20:39 -04:00
Nick Mathewson
72484a4953 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 2020-08-13 14:20:27 -04:00
Nick Mathewson
e82f36bccc Update ReleasingTor.md to current practice 2020-08-13 09:56:27 -04:00
Nick Mathewson
0957a5adb2 Merge branch 'maint-0.4.4'
"ours" to avoid version bump.
2020-08-13 09:44:11 -04:00
Nick Mathewson
26b257757b Bump to 0.4.4.4-rc-dev 2020-08-13 09:43:54 -04:00
Nick Mathewson
7b4716a762 Make test_glob() pass even when run as root.
Previously the test relied on not being able to look inside 000
directories, which is a thing root _can_ do.

Bug not in any released Tor version.
2020-08-12 20:36:23 -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
9d77ed7be2 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 20:21:04 -04:00
Nick Mathewson
effc9739bf Merge branch 'maint-0.4.4' 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
9ef991dbe3 Use correct type for gl_closedir to avoid a compiler warning 2020-08-12 14:42:30 -04:00
Nick Mathewson
e151442037 Merge remote-tracking branch 'tor-gitlab/mr/62' 2020-08-12 14:37:21 -04:00
Nick Mathewson
f9bb49d870 Fix allocation counting in clean_v2_descs_as_dir test.
Without this fix, running this test on its own would fail.

Fixes bug 40099. Bugfix on ade5005853 in 0.2.8.1-alpha.
2020-08-12 14:25:46 -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
f98b1988ec Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 12:29:17 -04:00
Nick Mathewson
11f1fe3aca Merge branch 'maint-0.4.4' 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
Daniel Pinto
60c436d14d Attempt to fix test_include.py on TravisCI #25140 2020-08-12 14:35:51 +01:00
Nick Mathewson
06c31b1b79 Remove changes files that have also appeared in 0.4.4 releases. 2020-08-12 08:51:43 -04:00
Nick Mathewson
db10d00199 Merge branch 'maint-0.4.4' 2020-08-12 08:40:27 -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
347f87ae9d Merge branch 'maint-0.4.4' 2020-08-12 13:47:59 +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
c591a0d246 Merge branch 'maint-0.4.4' 2020-08-12 13:23:33 +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
2f708079cd Use correct URL for CoreTorReleases in README.
Closes #40085
2020-08-11 18:43:33 -04:00
Nick Mathewson
4fdec27a12 Remove extraneous EVENT_CONTROLLER_WAIT
This turned into a new StreamStatus value.

Closes #40092. Bug not in any released Tor.
2020-08-11 18:41:15 -04:00
Nick Mathewson
b56985f022 CodingStandards.md: allow "bugfix on all supported versions.
Closes tpo/core/team#1 .
2020-08-11 17:58:11 -04:00
Nick Mathewson
ea0a704d52 Merge branch 'maint-0.4.4'
"ours" merge to avoid version bump.
2020-08-11 17:47:02 -04:00
Nick Mathewson
1770d1c216 bump version to 0.4.4.4-rc 2020-08-11 17:46:44 -04:00
Daniel Pinto
0b633b1f6d Improved documentation and comments #25140 2020-08-11 18:26:41 +01:00
Nick Mathewson
e93ff481f9 Merge branch 'maint-0.4.4' 2020-08-11 12:40:09 -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
11961f0bc5 Merge remote-tracking branch 'tor-gitlab/mr/119' 2020-08-11 12:39:30 -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
da9684d89a Merge branch 'maint-0.4.4' 2020-08-11 12:37:08 -04:00