Nick Mathewson
6b828ced0f
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:05:40 -04:00
Nick Mathewson
8a561fc5bf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:05:40 -04:00
Nick Mathewson
84a5bd48e2
Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5
2020-10-07 08:05:31 -04:00
Nick Mathewson
8ac1f8663b
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:03:52 -04:00
Nick Mathewson
b5a88e8d47
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:01:37 -04:00
Nick Mathewson
ed6a328297
Merge branch 'mr_124_squashed' into maint-0.3.5
2020-10-07 08:00:59 -04:00
Nick Mathewson
c5ba8b6221
Parallelize src/test/test into chunks.
...
First, we introduce a flag to teach src/test/test to split its work
into chunks. Then we replace our invocation of src/test/test in our
"make check" target with a set of 8 scripts that invoke the first
8th of the tests, the second 8th, and so on.
This change makes our "make -kj4 check" target in our hardened
gitlab build more than twice as fast, since src/test/test was taking
the longest to finish.
Closes 40098.
2020-10-07 08:00:49 -04:00
David Goulet
c374d49381
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-22 13:47:08 -04:00
David Goulet
beffad8529
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-22 13:47:08 -04:00
David Goulet
faf89ec6c2
srv: Remove spammy debug log
...
Fixes #40135
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-22 11:06:34 -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
7eef9ced61
)
Fixes #40125
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-17 13:00:23 -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
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
435f31aed3
Remove channel_is_canonical_is_reliable()
...
This function once served to let circuits continue to be built over
version-1 link connections. But such connections are long-obsolete,
and it's time to remove this check.
Closes #40081 .
2020-08-03 11:25:37 -04:00
Alexander Færøy
f67d5b39a4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-31 02:03:35 +00:00
Alexander Færøy
e78a7450a2
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-31 02:03:34 +00:00
Alexander Færøy
4e684c8695
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-31 02:03:34 +00:00
Nick Mathewson
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
Nick Mathewson
97b8a25162
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-29 12:37:07 -04:00
Nick Mathewson
3b8bf743ae
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-29 12:37:07 -04:00
Nick Mathewson
cdb0e6c252
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-29 12:37:07 -04:00
Nick Mathewson
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
Nick Mathewson
f7dbae4e89
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-23 10:09:14 -04:00
Nick Mathewson
6354b70e49
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-23 10:09:14 -04:00
Nick Mathewson
3bcbd69a77
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-23 10:09:14 -04:00
Nick Mathewson
f916ddd312
More info in the fallbackdir changes file
2020-07-23 10:08:42 -04:00
David Goulet
6f19e67c98
fallbackdir: Update list for 2020
...
Closes #40061
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-23 10:05:11 -04:00
David Goulet
05af1e25a0
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-13 14:58:40 -04:00
Nick Mathewson
0acc3ae879
Remove check-cocci from check-local target.
...
check-cocci is still a good idea -- perhaps as a cron job? But
doing it as part of our regular tests has just been confusing,
especially to volunteers who shouldn't have to become coccinelle
experts in order to get their patches through our CI.
Closes #40030 .
2020-07-13 09:24:26 -04:00
Nick Mathewson
9fd445f884
final entries for 0.4.3.6 changelog
2020-07-09 10:18:52 -04:00
Nick Mathewson
af08dad6d1
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-09 09:28:53 -04:00
Nick Mathewson
283ce30c53
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-09 09:28:53 -04:00
Nick Mathewson
18338f8771
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-09 09:28:53 -04:00
Nick Mathewson
7142f3e435
Merge branch 'trove_2020_001_035' into maint-0.3.5
2020-07-09 09:28:36 -04:00
Alexander Færøy
c364e0e83b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-08 00:36:48 +00:00
Alexander Færøy
cee58b7f92
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-08 00:36:48 +00:00
Alexander Færøy
b81e24cda6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-08 00:36:47 +00:00
Nick Mathewson
3e08dd9df1
Resolve a compiler warning from a 32-bit signed/unsigned comparison
...
This warning only affects platforms (like win32) with 32-bit time_t.
Fixes bug 40028; bugfix on 0.3.2.8-rc.
2020-07-07 15:05:38 -04:00
Alexander Færøy
a213d27938
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-07 14:48:36 +00:00
Alexander Færøy
dc45f0a8cb
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-07 14:48:36 +00:00
Alexander Færøy
19d579e8cb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-07 14:48:35 +00:00
David Goulet
d9cc2b2928
CI: Fix Appveyor printf format error
...
For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.
Fixes #40026
2020-07-07 09:53:54 -04:00
Nick Mathewson
c8f1ccbaef
Start 0.4.3.6 changelog
2020-07-06 16:52:41 -04:00