Nick Mathewson
48cd932ed1
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 17:47:18 -04:00
Nick Mathewson
1770d1c216
bump version to 0.4.4.4-rc
2020-08-11 17:46:44 -04:00
Nick Mathewson
872d369ce7
Merge branch 'maint-0.4.4' into release-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
e3b501c576
Merge branch 'maint-0.4.4' into release-0.4.4
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
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
912c8e6a8c
Merge branch 'maint-0.4.4' into release-0.4.4
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
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
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
3854123b0b
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 10:44:40 -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
39882a2021
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 14:54:26 +03: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
16b830ed52
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-10 19:33:07 -04: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
561ba475e9
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-06 13:24:12 -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
ea876ab00e
Wipe address strings from connections before freeing them them.
...
This is a defense-in-depth fix; closes 6198.
2020-08-03 10:15:08 -04:00
Nick Mathewson
5b9508c9a5
Add a tor_str_wipe_and_free() function.
...
Frequently we want to do
if (s) {
memwipe(s, 0, sizeof(s));
tor_free(s);
}
and it's good to have a way to do this concisely.
2020-08-03 10:11:03 -04:00
George Kadianakis
e62e46d930
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-03 16:49:04 +03:00
George Kadianakis
18d2c7c5d7
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
2020-08-03 16:48:52 +03:00
Alexander Færøy
0f5d594388
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-31 02:03:35 +00:00
Alexander Færøy
4c22050de1
Merge branch 'maint-0.4.3' into maint-0.4.4
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
Alexander Færøy
f04034536f
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-31 01:59:13 +00:00
Nick Mathewson
b4400e2093
Merge branch 'bug40076_043' into bug40076_044
2020-07-30 14:28:11 -04:00
Nick Mathewson
69d7752937
Merge branch 'bug40076_042' into bug40076_043
2020-07-30 14:27:29 -04:00
Nick Mathewson
c2d5ec5e43
Merge branch 'maint-0.4.2' into bug40076_042
2020-07-30 14:27:29 -04: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