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
41a7ab96e5
CI: Turn on stem with 044 and later.
2020-08-12 20:13:18 -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
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
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
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
bb3df5f322
practracker: Disable practracker in git hooks
...
Disable our coding standards best practices tracker in our git hooks.
0.4.3 branches only.
Closes ticket 33678.
2020-03-20 17:32:57 +10:00
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
57ff8d4a53
practracker: Read unicode files when using Python 2
...
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.
We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.
Fixes bug 33374; bugfix on 0.4.3.1-alpha.
2020-02-19 08:22:01 +10:00
f0964628e6
Merge branch 'ticket33029_042_01' into ticket33029_043_03
...
Conflicts:
doc/tor.1.txt
src/app/config/config.c
src/app/config/or_options_st.h
src/core/mainloop/connection.h
Between 042 and 043, the dirauth options were modularized so this merge commit
address this by moving the AuthDirRejectUncompressedRequests to the module
along with a series of accessors.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-11 10:30:29 -05:00
9f7e1ccacb
Undefined name: make_key() -> make_rsa_key()
2020-02-11 08:35:11 -05:00
b7bbff0c9c
Merge remote-tracking branch 'public/practracker_regen_overbroad_2'
2020-02-06 08:27:12 -05:00
5e963f97b1
practracker: use shutil.move so --regen will work on windows
...
On windows you can't os.rename() a file if the target filename
already exists.
2020-02-03 13:36:56 -05:00
ec965ba98b
practracker: integration tests for --regen and --regen-overbroad
2020-02-03 13:11:58 -05:00
2542a24b63
practracker: add a --regen-overbroad option to remove overbroad exceptions.
...
Closes ticket 32372.
2020-02-03 13:02:12 -05:00
472d58372b
Remove unused import UserDict
...
Fixes: https://trac.torproject.org/projects/tor/ticket/32791#comment:3
Unblocks: #1686
2020-02-03 17:55:58 +02:00
3208a74f90
Use print() function in both Python 2 and Python 3
2020-01-28 01:38:54 +01:00
cda10a2e89
Git hooks: remove support for 0.2.9 directory layout.
...
We no longer will be pushing or committing things in branches that
use src/common or src/or.
Resolves ticket 32957.
2020-01-23 10:28:09 -05:00
28c8c63de9
add_c_file: Replace asserts with exceptions
...
Closes 32962.
2020-01-20 13:27:40 +10:00
2c75d4a8d0
add_c_file: Improve script documentation
...
Part of 32962.
2020-01-20 13:20:14 +10:00
0418bc0cb2
add_c_file: Improve tor source directory checks
...
Check that the script isn't in a tor build directory, by looking
for a src/include.am file.
Part of 32962.
2020-01-20 13:04:02 +10:00
eb336e23a6
add_c_file: Rename variables based on the type of path
...
* fname for generic file paths
* tor_fname for paths relative to the top-level tor directory
* src_fname for paths relative to tor's src directory
With prefixes as required to disambiguate different paths of the same
type.
Part of 32962.
2020-01-16 09:27:57 +10:00
b828588499
add_c_file: Simplify some usage of srcdir_file()
...
Part of 32962.
2020-01-16 09:26:08 +10:00
3d50efcf98
add_c_file: Document the paths used by each part of the script
...
Most paths are relative to the top-level tor directory, but the
paths in the C and H files are relative to tor's src directory.
Part of 32962.
2020-01-16 09:26:04 +10:00
207d2625ed
add_c_file: Improve path handling and canonicalisation
...
* distinguish between paths relative to the top-level tor directory,
and paths relative to tor's src directory
* canonicalise paths before using them
* check that the script is run from the top-level tor directory
* check that the file is being created in tor's src directory
Part of 32962.
2020-01-16 09:25:58 +10:00
4f45ad1394
add_c_file: tolerate ./ in filenames.
2020-01-16 09:23:54 +10:00
ef1744e2c9
add_c_file: handle adding to the end of a list correctly.
...
Fixes bug 32962.
2020-01-16 09:23:49 +10:00
5e70c27e85
Merge remote-tracking branch 'tor-github/pr/1657'
2020-01-15 13:10:14 -05:00
b7cfca1dee
Merge branch 'pr1599_squashed'
2020-01-15 22:31:01 +10:00
b910ae8cd1
practracker: Wrap long lines in the test script
2020-01-15 22:29:52 +10:00
fa038e5617
practracker: Test practracker exit status
...
Part of 32705.
2020-01-15 22:29:48 +10:00
eb55d85e75
practracker: Fail tests if any process exits unexpectedly
...
Part of 32705.
2020-01-15 22:29:44 +10:00
cda2ff1965
practracker: Capture stderr output in test_practracker.sh
...
And canonicalise file paths, so that output is consistent, even in
out-of-tree builds.
Capturing stderr output produces better diagnostics.
Diagnostics for 32705.
2020-01-15 22:29:22 +10:00
c80694decc
scripts/git: Improve branch list comments
...
Hopefully, these explanations make it easier to get the next branch
transition right.
Part of 32772.
2020-01-15 12:28:00 +10:00
536eeb4589
scripts/git: Fix git-merge-forward after removing 0.2.9
...
We need a test branch for the earliest maint branch (maint-0.3.5),
but we can't merge forward into it, because there is no previous
active maint branch.
Also, edit a git-push-all comment that still said "029".
Bugfix on 32772; bug not in any released version of tor.
2020-01-15 12:22:38 +10:00
Nick Mathewson
teor
David Goulet
Christian Clauss