33184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
George Kadianakis	fb56b4c2bf	Merge branch 'tor-github/pr/1293'	2019-09-05 17:10:07 +03:00
George Kadianakis	c750ec20ab	Merge branch 'tor-github/pr/1291'	2019-09-05 17:09:20 +03:00
George Kadianakis	c29f05b159	Merge branch 'tor-github/pr/1292'	2019-09-05 17:06:58 +03:00
George Kadianakis	cdd7e88970	Merge branch 'tor-github/pr/1261'	2019-09-05 17:02:53 +03:00
Neel Chauhan	0127888b06	Add tests for IPv6 exit policies on microdescriptors	2019-09-05 17:02:45 +03:00
Neel Chauhan	be4a60945d	Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()	2019-09-05 17:02:45 +03:00
Nick Mathewson	2591440faa	Merge remote-tracking branch 'tor-github/pr/1278'	2019-09-05 07:41:58 -04:00
teor	9a402a654a	Merge branch 'maint-0.4.1'	2019-09-05 14:48:09 +10:00
teor	4596ead2fc	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-09-05 14:48:02 +10:00
teor	896a1ac50b	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-09-05 14:47:54 +10:00
teor	0461837149	Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5	2019-09-05 14:47:34 +10:00
teor	2ff6ebc6fc	Merge branch 'maint-0.4.1' ... Resolved modified/deleted conflict on changes/bug30649 by deleting the file. tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of changes/bug30649. We cherry-picked it to master, as well as merging to release-0.4.1.	2019-09-05 12:08:02 +10:00
teor	9dd908e713	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-09-05 12:05:12 +10:00
teor	c08d3e46ca	Merge commit '73890a86ef' into maint-0.4.1 ... tor-github/pr/1283, with the following changes: * cherry-pick the merge commit in 1283 on top of... * tor-github/pr/1174, but with the last commit re-worded to remove the fixup, because fixups break our push rules. This is an "ours" merge, except for the bugfix version change in changes/bug30649.	2019-09-05 12:04:27 +10:00
George Kadianakis	c1d61141f1	Add #30649 to ReleaseNotes.	2019-09-05 11:58:23 +10:00
George Kadianakis	87aaa9a2a5	Fix #30649 changelog entry.	2019-09-05 11:58:18 +10:00
George Kadianakis	73890a86ef	Merge branch 'bug30649_040' into bug30649_maint_041	2019-09-05 11:48:03 +10:00
George Kadianakis	61082c059c	Fix bugfix version in Bug 30649: Changes file.	2019-09-05 11:46:25 +10:00
teor	1203e137be	Merge commit '763fd0ad66' into maint-0.4.0 ... tor-github/pr/1174, but with the last commit re-worded to remove the fixup, because fixups break our push rules.	2019-09-05 11:42:26 +10:00
George Kadianakis	763fd0ad66	Fix bugfix version in Bug 30649: Changes file.	2019-09-05 11:41:45 +10:00
teor	4f762bc41d	Makefile: include checkShellScripts.sh in EXTRA_DIST ... Part of 30967.	2019-09-05 11:16:29 +10:00
teor	4b1d2ba979	changes: file for 30967	2019-09-05 11:15:30 +10:00
teor	5c2941e69f	shellcheck: Add shellcheck to the pre-commit hook ... * Move the shellcheck script from the Makefile to its own script file * Reformat the shellcheck script so it's easier to read and modify * Call the shellcheck script from the pre-commit hook Fixes bug 30967; not in any released version of Tor.	2019-09-05 11:15:26 +10:00
teor	d14573a623	Makefile: Explicitly list the subdirectories that contain scripts ... Part of 30967.	2019-09-05 11:15:22 +10:00
Nick Mathewson	106b75aa53	changes file for 31532	2019-09-04 12:06:27 -04:00
Nick Mathewson	3aba13f779	buffers: use ptrdiff_t to indicate offsets. ... Previously we used int in some places and off_t for others. Neither is correct: ptrdiff_t is right for differences between pointers. (off_t is only for offsets and sizes on the filesystem.)	2019-09-04 12:06:27 -04:00
Nick Mathewson	ec724fe8c8	rendclient: use ptrdiff, not off_t, for offset of DH field. ... The off_t type is only useful for offsets on the filesystem. For in-memory offsets, use ptrdiff_t.	2019-09-04 12:06:27 -04:00
Nick Mathewson	b39ee42904	compat_compiler: fix documentation for STRUCT_VAR_P ... Previously we had said that off_t was a reasonable type to hold the result of offsetof(). That isn't so: ptrdiff_t is correct.	2019-09-04 12:06:27 -04:00
Nick Mathewson	dc199f40fb	smartlist_pqueue: use ptrdiff_t instead of int for offsets. ... This is technically correct, but should not matter in practice, since we don't use this on any structs whose size exceeds INT_MAX.	2019-09-04 12:06:27 -04:00
Nick Mathewson	03ce67d378	config: explain CONFIG_TYPE_EXTENDED ... Also add an explanation of a possible future refactoring where we might remove the config_type_t enumeration entierly. Fixes ticket 31624. No changes file, since this is a comment-only change.	2019-09-04 11:54:42 -04:00
Nick Mathewson	870874fec8	config: Make CLEAR with a nonempty value into a nonfatal assertion. ... When we parse a CLEAR line (e.g., "/OrPort" or /OrPort blah blah"), we always suppress the value, even if one exists. That means that the block of code was meant to handle CLEAR lines didn't actually do anything, since we previously handled them the same way as with other empty values. Closes ticket 31529.	2019-09-04 11:28:21 -04:00
Nick Mathewson	539158f2be	config: use ptrdiff_t for all field-offset members. ... Previously we used int here, but it is more correct to use ptrdiff_t. (This never actually matters for our code in practice, since the structure we are managing here never exceed INT_MAX in size.)	2019-09-04 10:50:09 -04:00
David Goulet	34f3fcef40	Merge branch 'tor-github/pr/1290'	2019-09-04 10:33:49 -04:00
Nick Mathewson	4bcfa286f6	changes file for 31240	2019-09-04 10:31:45 -04:00
Nick Mathewson	46a3820652	Merge remote-tracking branch 'tor-github/pr/1270'	2019-09-04 09:52:35 -04:00
Nick Mathewson	c683896b7c	Update routerset reset test to use new mgr API.	2019-09-04 08:42:34 -04:00
Nick Mathewson	17a870a64b	Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged	2019-09-04 08:41:42 -04:00
David Goulet	f5fa283a04	Merge branch 'tor-github/pr/1288'	2019-09-04 08:34:26 -04:00
David Goulet	a816742f37	Merge branch 'maint-0.4.1'	2019-09-04 08:33:28 -04:00
David Goulet	630bb113a0	Merge branch 'tor-github/pr/1271' into maint-0.4.1	2019-09-04 08:33:10 -04:00
David Goulet	6210c75076	Merge branch 'tor-github/pr/1246'	2019-09-04 08:27:36 -04:00
teor	9c798dd5a5	torerr: Fix a comment typo and update the comment for format_number_sigsafe() ... Closes 31612.	2019-09-04 14:06:58 +10:00
George Kadianakis	7fa624537c	Merge branch 'tor-github/pr/1269'	2019-09-03 17:11:25 +03:00
Nick Mathewson	a617001fd4	Merge remote-tracking branch 'tor-github/pr/1279'	2019-09-03 09:47:25 -04:00
Nick Mathewson	78307ed186	Merge remote-tracking branch 'tor-github/pr/1272'	2019-09-02 14:13:32 -04:00
Nick Mathewson	01bda9bed1	Merge branch 'maint-0.4.1'	2019-09-02 14:11:32 -04:00
Nick Mathewson	e3a458e441	Merge branch 'ticket12399_035' into maint-0.4.1	2019-09-02 14:11:18 -04:00
rl1987	05fa1689eb	Change loglevel of message 'Hash of session info was not as expected'	2019-09-02 14:09:39 -04:00
teor	f538e23986	ChangeLog/ReleaseNotes: fix some incorrect bugfix versions ... Closes 31461.	2019-09-02 13:29:17 -04:00
teor	a3fad4d057	ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries ... Part of 31461.	2019-09-02 13:29:12 -04:00