2ddbfc64af
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-18 09:45:25 -04:00
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
078194ecaf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-17 13:56:40 -04:00
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
7915b651d9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-13 14:20:39 -04:00
45d9830493
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-13 14:20:39 -04:00
72484a4953
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
2020-08-13 14:20:27 -04:00
34919368ce
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 20:21:04 -04:00
07f0210a05
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 20:21:04 -04:00
aeafb7f44f
Improve comments in .gitlab-ci.yml
2020-08-12 20:20:58 -04:00
41a7ab96e5
CI: Turn on stem with 044 and later.
2020-08-12 20:13:18 -04:00
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
309eafbc3c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 12:29:17 -04:00
02bb719a94
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 12:29:17 -04:00
f5b9471547
CI: improve output when skipping doxygen
2020-08-12 12:28:44 -04:00
50b7bd243f
Try disabling "make all" when checking docs.
2020-08-12 12:28:44 -04:00
fe0e62ddc4
CI: Try to enable integration tests, hardening, and clang.
2020-08-12 11:29:46 -04:00
489d33e190
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 08:39:41 -04:00
6ef40144ae
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 08:39:41 -04:00
8182f1351a
CI: Remove VS2015 AppVeyor build.
2020-08-12 14:05:21 +03:00
0ec2d1528c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 12:37:08 -04:00
c6c0af403c
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 12:37:08 -04:00
adb7268236
CI: label our python versions.
2020-08-11 12:24:03 -04:00
9eb316de42
CI: Only run doxygen on 0.4.3 and later.
2020-08-11 12:22:35 -04:00
6a91a50d32
CI: enable documentation testing
2020-08-11 11:06:49 -04:00
6bee9bd481
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 11:03:24 -04:00
da8577bb75
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 11:03:24 -04:00
aa2c93b90b
Fix a pair of typos in ci-driver.sh.
2020-08-11 11:03:11 -04:00
262ddfee7a
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-11 10:44:40 -04:00
e4a6d9d5a9
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-11 10:44:40 -04:00
8a0f530adf
Add a pair of warnings about only editing CI in 035
2020-08-11 10:44:32 -04:00
f3fcc89d05
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-10 19:33:06 -04:00
68f8250cbb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-10 19:32:49 -04:00
e873c7e893
small code tweaks to try to work around debian stable complaints
2020-08-10 19:20:05 -04:00
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
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
39d5e7c764
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-06 13:24:11 -04:00
352991c843
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-06 13:24:11 -04:00
bac8967e24
Copy from master gitlab-ci.yml from master back to maint-0.3.5
2020-08-06 12:42:14 -04:00
e78a7450a2
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-31 02:03:34 +00:00
4e684c8695
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-31 02:03:34 +00:00
c4742b89b2
Fix a bug in buf_move_all() when the input buffer is empty.
...
We found this in #40076 , after we started using buf_move_all() in
more places. Fixes bug #40076 ; bugfix on 0.3.3.1-alpha. As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".
2020-07-30 14:24:25 -04:00
0a588821cb
Add unit test for buf_move_all(), including a failing case
...
The failing case is #if'd out for now, but will be fixed in the next
commit.
Testing for a fix for #40076 .
2020-07-30 14:19:32 -04:00
3b8bf743ae
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-29 12:37:07 -04:00
cdb0e6c252
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-29 12:37:07 -04:00
dcc60294ad
Use _lseeki64() on windows.
...
Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging
system to use posix fds.
2020-07-28 11:30:47 -04:00
97d0cb83ed
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-27 12:56:18 -04:00
c0bc30b6f0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-27 12:56:18 -04:00
564a9a54a1
fallbackdir: Remove all three Digitalcourage3 relays
...
They are about to be shutdown in September.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-07-24 14:56:07 -04:00
6354b70e49
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-23 10:09:14 -04:00
David Goulet
Nick Mathewson
George Kadianakis
Alexander Færøy