33843 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nick Mathewson	a03c0394a3	Merge branch 'maint-0.4.2' ... "ours" to avoid version bump.	2019-10-23 20:26:15 -04:00
Nick Mathewson	76939cf293	Bump to 0.4.2.3-alpha	2019-10-23 20:25:34 -04:00
teor	20606b8a15	Merge remote-tracking branch 'tor-github/pr/1447'	2019-10-24 10:00:47 +10:00
David Goulet	9586ae178a	Merge branch 'tor-github/pr/1451'	2019-10-23 09:11:43 -04:00
teor	34509e78c6	Merge remote-tracking branch 'tor-github/pr/1449'	2019-10-23 22:59:16 +10:00
teor	226f11002d	changes: file for 32216	2019-10-23 13:36:39 +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
teor	d804a81cf1	changes: file for 29603 ... We merged this change without a changes file.	2019-10-23 12:26:32 +10:00
teor	8a56819d23	Merge branch 'maint-0.4.2'	2019-10-23 10:00:49 +10:00
teor	65545e1345	Merge branch 'maint-0.4.1' into maint-0.4.2 ... `git merge --strategy ours` to use STATIC for unit tests in maint-0.4.2.	2019-10-23 09:59:07 +10:00
teor	8bc65cda44	Merge branch 'pr1450_squashed' into maint-0.4.1	2019-10-23 09:58:22 +10:00
Nick Mathewson	f3c0a0b9fe	Authorities reject relays running unsupported Tor release series. ... Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now rejected. Also, extract this version-checking code into a new function, so we can test it. Closes ticket 31549. Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.	2019-10-23 09:57:51 +10:00
teor	9db1602ec5	Merge branch 'maint-0.4.2'	2019-10-23 08:47:30 +10:00
teor	b45048feaf	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-10-23 08:47:23 +10:00
teor	4a5c909ce5	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-10-23 08:47:15 +10:00
teor	57acdaa3f1	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-10-23 08:47:08 +10:00
teor	d175e70817	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-10-23 08:47:01 +10:00
teor	641f130447	Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0	2019-10-23 08:35:17 +10:00
teor	c77162e4e9	Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5	2019-10-23 08:32:52 +10:00
teor	8682442c76	Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9	2019-10-23 08:32:22 +10:00
teor	27965f1ef2	Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5	2019-10-23 08:30:48 +10:00
teor	003be727c4	Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5	2019-10-23 08:28:03 +10:00
teor	1ea19d7a5b	Merge branch 'maint-0.2.9' into maint-0.3.5 ... `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.	2019-10-23 08:25:42 +10:00
teor	7660a7cf7d	Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9	2019-10-23 08:20:45 +10:00
Philipp Winter	80a198928e	Remove outdated note. ... BridgeDB supports bridge-distribution lines since version 0.5.0: <https://bugs.torproject.org/23957>	2019-10-23 07:52:05 +10:00
Roger Dingledine	4233fb7014	clarify in man page: we count by powers of two ... Make clear in the man page, in both the bandwidth section and the accountingmax section, that Tor counts in powers of two, not powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion bytes. Resolves ticket 32106.	2019-10-23 07:50:20 +10:00
teor	339c18d6c7	Tidy whitespace around some STMT_BEGINs and STMT_ENDs	2019-10-23 07:37:39 +10:00
Nick Mathewson	1cdc030c3d	Merge branch 'maint-0.4.2'	2019-10-22 14:47:28 -04:00
Nick Mathewson	2ed194c9a9	Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2	2019-10-22 14:46:10 -04:00
Nick Mathewson	04addabb04	Changes file for options_validate() API changes in #32187.	2019-10-22 14:24:09 -04:00
Nick Mathewson	6bc2b41e54	config validation: make the "old_options" argument const. ... We can't do this with the "options" argument yet, since several places in the code change those right now.	2019-10-22 14:24:09 -04:00
Nick Mathewson	3656fdae98	test_options: remove def_opt member of test data.	2019-10-22 14:24:09 -04:00
Nick Mathewson	86a1d670ac	test_options: remove "dflt" part of setup_options(). ... It is no longer used anywhere.	2019-10-22 14:24:09 -04:00
Nick Mathewson	475a1dc9be	Remove a pair of now-unused default-options arguments.	2019-10-22 14:24:03 -04:00
Nick Mathewson	3dc0944acd	test_options: Fix options_validate() calls in macros. ... Coccinelle missed these.	2019-10-22 14:24:03 -04:00
Nick Mathewson	41e6e2f496	Use coccinelle to fix most options_validate() call sites. ... There was one that it could not find because it was in a macro definition. I used the following semantic patch: @@ expression e1, e2, e3, e4, e5; @@ options_validate(e1, e2, - e3, - e4, e5)	2019-10-22 14:01:42 -04:00
Nick Mathewson	8a27023d21	Remove unused arguments from options_validate(). ... This change breaks compilation; a subsequent commit will fix it with a coccinelle patch.	2019-10-22 13:56:11 -04:00
Nick Mathewson	697d99e504	validate_fn(): remove now-unused defaults and from_setconf. ... These arguments were only used by options_validate, and are now ignored even there.	2019-10-22 13:52:40 -04:00
Nick Mathewson	91413e04b4	Remove changes files that are already merged in 0.4.2.	2019-10-22 13:01:25 -04:00
Nick Mathewson	de24a7f992	Merge branch 'maint-0.4.2'	2019-10-22 12:54:44 -04:00