vnepveu
43672f9fca
Implement IPv6 sybil protection.
...
[This is a squashed patch for ticket 7193, based on taking a "git
diff" for the original branch, then applying it with "git apply
-3". I earlier attempted to squash the branch with "git rebase",
but there were too many conflicts. --nickm]
2020-09-23 11:30:15 -04:00
Nick Mathewson
679ba1a226
Merge branch 'maint-0.4.4'
2020-09-21 12:59:03 -04:00
Nick Mathewson
1cce0588e1
Merge branch 'maint-0.4.3' into maint-0.4.4
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
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
09813fe31e
Merge branch 'maint-0.4.3' into maint-0.4.4
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
122b297a20
Copy tracing things back to maint-0.3.5, for consistency.
2020-09-18 15:53:06 -04:00
Nick Mathewson
ca389d22a1
Remove 0.4.2 from list of branches in git script: it has reached EOL.
2020-09-15 09:00:44 -04:00
David Goulet
20a990cea3
ci: Add tracing build to Gitlab CI
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-08-25 10:38:48 -04:00
Daniel Pinto
ebaa1a1d23
Make options_init_from_torrc smaller #40102
...
Split implementation of several command line options from
options_init_from_torrc into smaller isolated functions.
2020-08-14 16:01:02 +01: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
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
07f0210a05
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 20:21:04 -04:00
Nick Mathewson
41a7ab96e5
CI: Turn on stem with 044 and later.
2020-08-12 20:13:18 -04:00
Nick Mathewson
e151442037
Merge remote-tracking branch 'tor-gitlab/mr/62'
2020-08-12 14:37:21 -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
f98b1988ec
Merge branch 'maint-0.4.3' into maint-0.4.4
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
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
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
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
e4ef3c61f7
Merge branch 'maint-0.4.4'
2020-08-11 11:03:25 -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
673d02bdb0
Merge branch 'maint-0.4.3' into maint-0.4.4
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
0ee3b83a0b
Merge branch 'maint-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
Nick Mathewson
069946852a
Merge branch 'maint-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
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
Daniel Pinto
ccdd0d801a
Minor style improvements. #30045
2020-08-03 20:08:17 +01:00
Daniel Pinto
1474ab3395
Add --format argument to --key-expiration option. #30045
2020-08-01 01:08:37 +01:00
Nick Mathewson
d6570eaf5d
Merge remote-tracking branch 'tor-gitlab/mr/59'
2020-07-20 16:37:11 -04:00
Alexander Færøy
b18e274919
Merge branch 'tor-gitlab/mr/66'
2020-07-20 14:22:29 +00:00
