torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,623 Commits 53 Branches 631 Tags
0befdb8a35f26a1423107d181ecf08c48fb05229
Commit Graph

370 Commits

Author SHA1 Message Date
rl1987 0befdb8a35 Disable git diff pagination 2019-03-10 18:28:07 +02:00
rl1987 537692c1e3 Using diff -u in check_for_diffs 2019-03-10 18:28:07 +02:00
rl1987 5f253f6a47 Iterate over contents of scripts/git with check_for_script_update function 2019-03-10 18:28:06 +02:00
rl1987 888bb9508b Move all git maintenance scripts to separate directory 2019-03-10 18:28:06 +02:00
rl1987 7b5f31f2d6 Mention what file has changed 2019-03-10 18:28:06 +02:00
rl1987 88633fad5b Write a comment for post-merge.git-hook 2019-03-10 18:28:06 +02:00
rl1987 bb8b2f47d0 Also print changes in git helper scripts, if any 2019-03-10 18:28:06 +02:00
rl1987 2d3ef34dce Add post-merge git hook to warn about git hooks being updated in the repo 2019-03-10 18:28:06 +02:00
Nick Mathewson 8fd20df455 Merge remote-tracking branch 'tor-github/pr/743' 2019-03-08 10:07:25 -05:00
David Goulet db2e916afe Merge branch 'tor-github/pr/717' 2019-03-05 14:26:59 -05:00
rl1987 7f0516022b Also disallow pushing to/from upstream branch when branch names do not match 2019-03-05 14:26:09 -05:00
rl1987 0deea98d02 Improve pre-push.git-hook description 2019-03-05 14:26:09 -05:00
rl1987 f3eac74ed9 In pre-push hook script, actually check local and remote refs 2019-03-05 14:26:09 -05:00
rl1987 ae5a0f39cd Update git pre-push hook so that only upstream branches can get pushed to origin 2019-03-05 14:26:09 -05:00
David Goulet 436e0c8ca4 maint: Make git scripts fetch origin once 
Replace the "git pull" by one single "git fetch origin" and then "git merge"
into each defined branches.

This speeds up the process considerably.

Closes #29616

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-03-01 09:24:46 -05:00
David Goulet 9256b02cc8 maint: Remove 0.3.3 branch from git scripts 
It is EOL today: Febuary 28th, 2019

No more releases will occur.

Closes #29616

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-02-28 13:16:41 -05:00
George Kadianakis cec555f44c Merge branch 'tor-github/pr/720' 2019-02-28 12:32:16 +02:00
David Goulet e1ad22643e maint: Helpful scripts for tor maintenance 
Closes #29391

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-02-26 10:52:25 -05:00
Nick Mathewson b3b737b875 Update pre-commit.git-hook for ticket 29553 
- handle older source layout
 - handle empty changes directories
 - "set -e" so that  we exit if there's a problem.
 2019-02-21 13:35:33 -05:00
Nick Mathewson a036c0187a cov-diff: better handle the case where a file stops having coverage 2019-02-08 11:22:55 -05:00
Nick Mathewson f4c76661d1 Add a script to check for coverage nondeterminism 
Closes ticket 29436.
 2019-02-08 11:22:24 -05:00
Nick Mathewson f2b646a2b6 Merge branch 'ticket29435_035' into ticket29435_040 2019-02-08 10:47:04 -05:00
Nick Mathewson 192b312c97 Fix coverage script. 
It was looking for object files made with the old automake
directorations, but those changed when we split up our libraries.

Fixes bug 29435; bugfix on 0.3.5.1-alpha.
 2019-02-08 10:43:38 -05:00
Nick Mathewson 8b254c1c70 Merge branch 'precommit_squashed' 2019-01-24 11:08:10 -05:00
Nick Mathewson dd22c84ccf Only run the checkIncludes.py script if it exists 
(It was added in 0.3.5)
 2019-01-24 08:06:09 -05:00
Nick Mathewson 107e50a90f lintChanges.py didn't take a directory argument in 0.2.9 2019-01-24 08:05:42 -05:00
rl1987 611e8dcda7 Also run checkInclude.py before every commit 2019-01-24 08:03:17 -05:00
rl1987 99fffc6c2f Add a pre-commit hook that runs code and changelog entry formatting checks 2019-01-24 08:03:17 -05:00
Nick Mathewson 00bc18b847 Merge remote-tracking branch 'tor-github/pr/653' 2019-01-22 08:13:14 -05:00
Nick Mathewson aaef95ada5 format_changelog: treat "issue NNNN" as a track ticket 2019-01-18 10:15:02 -05:00
Nick Mathewson 7e1f893460 lintChanges.py: Two python re usage fixes 2019-01-17 08:46:06 -05:00
Nick Mathewson 2f683465d4 Bump copyright date to 2019 2019-01-16 12:33:22 -05:00
Nick Mathewson 9473a386c4 Update copyright script for 2019 2019-01-16 12:33:09 -05:00
Nick Mathewson efe55b8898 Bump copyright date to 2019. 2019-01-16 12:32:32 -05:00
Nick Mathewson 2dd23086f1 Remove fallback scripts and whitelist 
They have been extracted to a new fallback-scripts.git repository.

Closes ticket 27914.
 2019-01-15 19:20:25 -05:00
Nick Mathewson 31e784915e Use [ -n "$x" ] in place of [ ! -z "$x" ] in chutney-git-bisect 
Closes 29099.
 2019-01-15 18:26:08 -05:00
rl1987 d47e7863bd Depending on script mode, either use 'whitelist' or 'fallback list' 2019-01-15 08:25:29 -05:00
rl1987 7fbe7a2563 In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist' 2019-01-15 08:25:29 -05:00
Nick Mathewson 4afc6b172a Merge branch 'ticket28755_v2_squashed' 2018-12-12 11:07:38 -05:00
Nick Mathewson 5200df8557 Copy the nss-related changes into fuzzing_include_am.py. 2018-12-12 11:07:08 -05:00
Nick Mathewson 845e8dbe59 Fuzzing module for various string operations, currently focusing on 
encoding and decoding.

There are bunches of places where we don't want to invest in a full
fuzzer, but we would like to make sure that some string operation
can handle all its possible inputs.  This fuzzer uses the first byte
of its input to decide what to do with the rest of the input.  Right
now, all the possibilities are decoding a string, and seeing whether
it is decodeable.  If it is, we try to re-encode it and do the whole
thing again, to make sure we get the same result.

This turned up a lot of bugs in the key-value parser, and I think it
will help in other cases too.

Closes ticket 28808.
 2018-12-12 11:07:08 -05:00
Nick Mathewson 91be6a77e9 Merge remote-tracking branch 'teor/ticket24838' 2018-12-11 10:04:16 -05:00
Nick Mathewson b915b6cd21 Merge remote-tracking branch 'github/prop297' 2018-12-11 09:44:57 -05:00
Nick Mathewson 58d2ced572 Merge remote-tracking branch 'teor/24805-phoul' 2018-12-11 09:38:27 -05:00
Nick Mathewson b65166750d Merge remote-tracking branch 'rl1987/ticket28007_take2' 2018-12-11 09:25:46 -05:00
rl1987 da264f7c76 Let's not double-quote OUTPUTARG after all 2018-12-08 15:17:22 +02:00
teor 6bc5c06dc2 Fallbacks: accept relays that are a fuzzy match to the whitelist 
If a relay matches at least one fingerprint, IPv4 address, or IPv6
address in the fallback whitelist, it can become a fallback. This
reduces the work required to keep the list up to date.

Closes ticket 28768.
 2018-12-07 16:30:24 +10:00
teor 75b5cc047d Fallbacks: refactor is_in_whitelist() to take an exact match boolean 
No behaviour change.

Preparation for 24838.
 2018-12-07 15:54:32 +10:00
teor 7f3a7d9a27 Fallbacks: Rename CONSENSUS_EXPIRY_TOLERANCE to REASONABLY_LIVE_TIME 
Cleanup after 28768.
 2018-12-07 15:54:32 +10:00
teor c3fe405e21 Fallbacks: use a 24 hour future consensus tolerance 
Tor clients on 0.3.5.6-rc? and later will use a consensus that will become
valid up to 24 hours in the future.

Clients on 0.3.5.5-alpha? and earlier won't accept future consensuses.

Update the fallback expiry tolerance to match tor's checks.

Part of 28768, follow-up on 28591.
 2018-12-07 15:54:32 +10:00