Nick Mathewson
2b6faed7ba
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-21 12:59:03 -04:00
Nick Mathewson
0d78fbb718
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-21 12:59:03 -04:00
Nick Mathewson
8458c8211e
gitlab-ci: Use test-network-all for debian-integration
2020-09-21 12:58:49 -04:00
Nick Mathewson
7280bb50b2
gitlab-ci: add an NSS check.
2020-09-21 12:58:49 -04:00
Nick Mathewson
3ee0f6371d
gitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.
2020-09-21 12:58:49 -04:00
Nick Mathewson
ab03ca9c75
gitlab-ci: Add disable-module builds.
2020-09-21 12:58:49 -04:00
Nick Mathewson
1bbeddf99e
Add a few more options for the CI script.
...
These are:
--disable-module-relay
--disable-module-dirauth
--enable-all-bugs-are-fatal
--enable-nss
2020-09-21 12:58:49 -04:00
Nick Mathewson
075beab2fb
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-18 19:06:16 -04:00
Nick Mathewson
b643ced022
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-18 19:06:16 -04:00
Nick Mathewson
0b77c706a1
Make debian-trace job conditional on src/lib/trace/trace_sys.c
2020-09-18 19:05:51 -04:00
Nick Mathewson
f8f3e57016
.gitlab.yml: missing comments
2020-09-18 15:55:06 -04:00
Nick Mathewson
122b297a20
Copy tracing things back to maint-0.3.5, for consistency.
2020-09-18 15:53:06 -04:00
David Goulet
3028e85b11
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-18 09:45:25 -04:00
David Goulet
2ddbfc64af
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-18 09:45:25 -04:00
Nick Mathewson
7945e075a4
Fix underflow in rend_cache/free_all test.
...
We already fixed these in #40099 and #40125 .
This patch fixes #40126 . Bugfix on 0.2.8.1-alpha.
2020-09-17 14:04:54 -04:00
Nick Mathewson
023728cb84
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-17 13:56:40 -04:00
Nick Mathewson
078194ecaf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-17 13:56:40 -04:00
David Goulet
47f1d19f8e
test: Increment rend cache allocation before freeing
...
The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.
Without it, it had an underflow bug:
Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
7eef9ced61Fixes #40125
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-17 13:00:23 -04:00
David Goulet
ea339227c2
conn: Remove assert on new listener connection when retrying
...
Opening a new listener connection can fail in many ways like a bind()
permission denied on a low port for instance.
And thus, we should expect to handle an error when creating a new one instead
of assert() on it.
To hit the removed assert:
ORPort 80
KeepBindCapabilities 0
Start tor. Then edit torrc:
ORPort <some-IP>:80
HUP tor and the assert is hit.
Fixes #40073
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-01 10:01:21 -04:00
Nick Mathewson
e78ce52aff
Merge branch 'maint-0.4.3' into release-0.4.3
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
146e4cfa95
Merge branch 'maint-0.4.3' into release-0.4.3
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
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
2020-08-12 14:25:46 -04:00
Nick Mathewson
f94ad3d32a
Merge branch 'maint-0.4.3' into release-0.4.3
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
cff2c3d5fa
Merge branch 'maint-0.4.3' into release-0.4.3
2020-08-12 08:39:41 -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
8182f1351a
CI: Remove VS2015 AppVeyor build.
2020-08-12 14:05:21 +03:00
Nick Mathewson
c87a5d7af5
Merge branch 'maint-0.4.3' into release-0.4.3
2020-08-11 12:37:08 -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
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
4ccf99b549
Merge branch 'maint-0.4.3' into release-0.4.3
2020-08-11 11:03:24 -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
aa2c93b90b
Fix a pair of typos in ci-driver.sh.
2020-08-11 11:03:11 -04:00
Nick Mathewson
e0caad5d4f
Merge branch 'maint-0.4.3' into release-0.4.3
2020-08-11 10:44:40 -04:00
