Nick Mathewson
31f8b4fa65
Merge branch 'stream-socks-auth' into bug19859_merged
2019-11-25 07:58:02 -05:00
Nick Mathewson
d9d75d4ae1
rename_c_identifier: don't crash when doing only one replacement.
2019-11-23 15:30:18 -05:00
Nick Mathewson
5060007f4b
Split log configuration out of options_act_reversible().
2019-11-19 16:03:32 -05:00
George Kadianakis
53ac9a9a91
Add changes file for #30381 .
2019-11-18 19:21:10 +02:00
David Goulet
1371d29e5b
Merge branch 'tor-github/pr/1489'
2019-11-14 10:37:14 -05:00
teor
3b4a360ed0
practracker: Don't read editor temp files, attempt 2
...
(Or any files that start with "." or "#".)
Obviously correct changes to already-reviewed code.
2019-11-14 16:12:19 +10:00
teor
7ee1e16c6f
scripts/git: Stop failing when upstream branches don't exist
...
If you add a custom remote, or a new branch, and don't fetch first,
then the script would fail when checking for unchanged branches.
Instead, skip the check: a new branch is definitely a change.
2019-11-07 12:04:51 +10:00
teor
3864536b7c
scripts/git: Remove extra printfs from a bad merge
2019-11-07 12:04:22 +10:00
teor
e6b5a1ff93
shellcheck: Fix minor issues in some scripts
...
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and
test_parseconf.sh.
Fixes bug 32402; not in any released version of tor.
Obviously correct changes to already reviewed code.
2019-11-06 16:21:01 +10:00
teor
f7b45975bf
Merge branch 'bug32402_042' into bug32402_master
...
Merge changes from master with shellcheck fixes.
2019-11-06 16:14:06 +10:00
teor
7f23d47f72
shellcheck: Fix issues in the git-*.sh scripts
...
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 16:09:31 +10:00
teor
57baea701f
shellcheck: Start checking most scripts for errors
...
This check was accidentally disabled by a bad find command.
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 15:49:50 +10:00
teor
60d5ff303d
practracker: Preserve improvements
2019-11-05 14:28:02 +10:00
teor
6169469546
Merge remote-tracking branch 'tor-github/pr/1477'
2019-11-05 14:23:10 +10:00
teor
bcb38d984d
practracker: Update the exceptions file with improvements
...
Regenerate the exceptions file, but only commit the improvements.
Includes changes from 32213 and other tickets.
2019-11-05 12:50:08 +10:00
teor
81972353cb
scripts: Fix update_versions.py for out-of-tree builds
...
Fixes bug 32371; bugfix on 0.4.0.1-alpha.
2019-11-05 12:00:59 +10:00
teor
c065ad3e3d
practracker: Rename functions modified by a previous commit
...
Part of 32213.
2019-11-05 11:36:26 +10:00
JeremyRand
736322ce61
Bug #19859 : Increase function-size exception to 124
2019-11-03 07:11:08 +00:00
teor
1ffb3b549f
scripts/git: Add TOR_EXTRA_REMOTE_* for an extra git remote
...
When running git-setup-dirs.sh.
Part of 32347.
2019-10-31 14:59:19 +10:00
teor
38e8cca6a1
scripts/git: Add TOR_EXTRA_CLONE_ARGS for git clone
...
When running git-setup-dirs.sh.
Part of 32347.
2019-10-31 14:59:16 +10:00
teor
995618ec61
scripts/git: Make a master symlink in the worktree directory
...
When running git-setup-dirs.sh.
Part of 32347.
2019-10-31 14:59:12 +10:00
teor
e046903f93
scripts/git: Restore a dropped check for pre-commit in pre-push
...
Bugfix on 31919; not in any released version of Tor.
2019-10-31 14:51:31 +10:00
teor
7e73c0d5a1
scripts/git: Print the correct path in git-setup-dirs.sh
2019-10-31 14:39:49 +10:00
teor
cb7340abf1
scripts/git: Don't use spaces in git URLs
2019-10-31 13:56:59 +10:00
teor
3479024cb1
scripts: Change to the top source directory as needed
...
Bugfix on 31919; not in any released version of tor.
2019-10-28 13:28:50 +10:00
teor
18e09913bf
practracker: Don't read editor temp files
...
(Or any dot files.)
Obviously correct changes to already-reviewed code.
2019-10-28 13:09:58 +10:00
teor
68befa3b84
scripts/git: Fix a shellcheck error in pre-commit.git-hook
...
Some versions of shellcheck do not detect this error.
Bugfix on 31919; not in any released version of tor.
2019-10-28 13:04:29 +10:00
Nick Mathewson
e7993dc046
Merge branch 'ticket31241_v3'
2019-10-25 08:10:39 -04:00
teor
00c3fba61c
scripts/maint: Stop assuming that python3 is in /usr/bin
...
Obviously correct fix to rename_c_identifier.py.
Bugfix on 32237; not in any released version of tor.
2019-10-25 16:46:54 +10:00
teor
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462'
2019-10-25 16:14:37 +10:00
Nick Mathewson
dc6d7f072d
Make foo_validate() functions call config_validate().
...
The former foo_validate() functions are now toplevel
legacy_validate_fn callbacks. The new foo_validate() functions now
call them.
This change lets us remove the old shared_random disk state
validation callback entirely.
2019-10-24 20:30:32 -04:00
teor
b3d035d5c4
Merge remote-tracking branch 'tor-github/pr/1463'
2019-10-25 10:27:41 +10:00
Nick Mathewson
fcdb66acd3
Add a script to rename C identifiers, and optionally add a commit message
...
This script should "pay for itself" if it prevents one bug caused by
careless search-replace-commit loops.
2019-10-24 08:20:31 -04:00
teor
1094389d82
scripts/git: Make spaces consistent in pre-push.git-hook
...
Part of 31919.
2019-10-24 14:10:30 +10:00
teor
b4b316631d
scripts/git: Only check modified files in existing git hook checks
...
Part of 31919.
2019-10-24 14:10:26 +10:00
teor
b9a2286765
scripts/git: Add check_cocci_parse.sh to the pre-commit hook
...
But only check modified files, which dramatically speeds up
check_cocci_parse.sh.
Part of 31919.
2019-10-24 14:09:53 +10:00
teor
71b8b7ee2d
scripts/cocci: Check owned src in check_cocci_parse.sh by default
...
Check the tor-owned sources in an 0.3.5 directory layout, if no
files are provided on the command line.
Part of 31919.
2019-10-24 14:09:45 +10:00
teor
330717f018
scripts/cocci: Add check_cocci_parse.sh and default exceptions
...
Add check_cocci_parse.sh, which is a thin wrapper around
try_parse.sh. Add a default exceptions file, and use it in
check_cocci_parse.sh.
Part of 31919.
2019-10-24 11:40:58 +10:00
teor
87ee49e016
scripts/cocci: Remove unused arguments from try_parse.sh spatch
...
Part of 31919.
2019-10-24 11:40:54 +10:00
teor
9a96068a0b
scripts/cocci: Add an exceptions file to try_parse.sh
...
Set $TOR_COCCI_EXCEPTIONS_FILE to the name of an exceptions file,
containing a list of filename patterns matched by 'grep -f'.
Part of 31919.
2019-10-24 11:40:51 +10:00
teor
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
teor
f43a7a4d96
scripts/git: Avoid sleeping before the last push in git-push-all.sh
...
Change the loop order, so that we only sleep between pushes,
and avoid sleeping after all the pushes are done.
(In rare cases, there may still be an extra sleep.)
Part of 32216.
2019-10-23 13:28:37 +10:00
teor
4f6f006c99
scripts/git: Make git-push-all.sh skip more branches that match upstream
...
The script now skips master, maint-* and release-* branches that match
upstream, not just test branches.
And fix "no branches" bugs that this change makes happen more often.
Part of 32216.
2019-10-23 13:28:15 +10:00
teor
9a3b768fae
scripts/git: Pass all unrecognised arguments to git-push-all.sh
...
This makes the behaviour of git-push-all.sh -n identical to the other
git scripts.
Part of 32216.
2019-10-23 13:04:28 +10:00
teor
71191fa3dc
scripts/git: Fix a variable name typo in git-push-all.sh
...
Obviously correct changes to already reviewed code.
2019-10-23 13:01:55 +10:00
Nick Mathewson
b2d487ae22
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
...
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
2019-10-22 09:39:06 -04:00
Nick Mathewson
3e41459dff
confmacros.h: fix coccinelle parsing.
2019-10-22 09:32:13 -04:00
Nick Mathewson
d6ce8527f8
tor-coccinelle.h: add a definition for EXTERN
2019-10-22 09:32:13 -04:00
Nick Mathewson
6696a5bbae
tor-coccinelle.h: add HANDLE_{DECL,IMPL}
2019-10-22 09:32:13 -04:00
Nick Mathewson
d129b503c0
tor-coccinelle.h: add EAT_SEMICOLON
2019-10-22 09:32:13 -04:00