34497 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	13216f848a	Merge branch 'maint-0.4.2'	2020-01-06 08:08:59 -05:00
Nick Mathewson	2d8d6d1ebf	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-06 08:08:59 -05:00
Nick Mathewson	f5461a4bdf	update changes file to pass "make check-changes"	2020-01-06 08:08:48 -05:00
Nick Mathewson	16e94dc7a7	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-06 08:06:54 -05:00
Peter Gerber	b9d81282e0	Fix sandbox crash during reload of logging configuration ... Allow calls to dup() which was introduced in commit a22fbab986. From a security perspective, I don't think this should impact the security of the sandbox significantly. As far as I can tell, there is nothing an adversary can do with a duplicated FD that can't be done with the original.	2020-01-05 15:24:45 +00:00
Neel Chauhan	b062e0f0a4	Fix spacing in tor_sscanf() call in tor_inet_aton()	2019-12-20 14:11:03 -05:00
Neel Chauhan	01c6fde326	Fix spacing in tor_inet_aton() function header	2019-12-20 14:10:43 -05:00
Nick Mathewson	33a0f15b21	Merge branch 'bug29819_035'	2019-12-20 07:37:47 -05:00
Nick Mathewson	34f92a6e73	Merge remote-tracking branch 'tor-github/pr/1623'	2019-12-20 07:18:38 -05:00
teor	8c23ac4ae7	Replace several C identifiers. ... This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ EXPOSE_CLEAN_BACKTRACE BACKTRACE_PRIVATE \ TOR_CHANNEL_INTERNAL_ CHANNEL_OBJECT_PRIVATE \ CHANNEL_PRIVATE_ CHANNEL_FILE_PRIVATE \ EXPOSE_ROUTERDESC_TOKEN_TABLE ROUTERDESC_TOKEN_TABLE_PRIVATE \ SCHEDULER_PRIVATE_ SCHEDULER_PRIVATE	2019-12-20 13:27:58 +10:00
teor	da1f76f126	Merge branch 'maint-0.4.2'	2019-12-20 10:12:59 +10:00
teor	5dbb607e94	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-12-20 10:12:51 +10:00
teor	7237637871	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-20 10:12:43 +10:00
teor	7e17c24381	Merge remote-tracking branch 'tor-github/pr/1606'	2019-12-20 10:12:18 +10:00
teor	cd160291a7	Code Style: Delete headers that are included twice ... These changes were created using the "make autostyle" from 32522, and then split into commits.	2019-12-20 09:53:31 +10:00
teor	d8b868e483	Code Style: Delete PRIVATE defines that are never used ... Some ".c" files define *_PRIVATE macros, but those macros are not used in any header file. Delete them. These changes were created using the "make autostyle" from 32522, and then split into commits.	2019-12-20 09:50:50 +10:00
teor	57b6678d52	Run "make autostyle"	2019-12-20 09:45:53 +10:00
teor	ac3a9aaf0d	Makefile/git scripts: Add comments to keep owned file lists in sync	2019-12-20 09:35:18 +10:00
Nick Mathewson	a6ba56761b	Merge branch 'dirauth_config_squashed'	2019-12-19 07:55:06 -05:00
Nick Mathewson	13df744921	Declare relay/dirauth subsystem levels in a header. ... This way, we can't get out of sync between the two declarations.	2019-12-19 07:54:56 -05:00
Nick Mathewson	8d474e4dc5	Add an integration test for options disabled by dirauth subsystem.	2019-12-19 07:54:56 -05:00
Nick Mathewson	ffa3499d81	Add config object for dirauth; move one option there. ... I've chosen the "AuthDirMaxServersPerAddr" option here for simplicity, since it is used literally nowhere else besides the dirauth module. Once we have all the infrastructure in place for this, we can move more options into this structure.	2019-12-19 07:54:56 -05:00
Nick Mathewson	419ba97df5	Allow struct_magic to be disabled. ... When a subsystem is disabled, there will be no corresponding object allocated, and no magic numbers on it.	2019-12-19 07:54:56 -05:00
Nick Mathewson	9082a6db3f	Support a flag to indicate that a config var is disabled ... Like "obsolete" variables, these variables produce a warning when you try to set them, but the warning says that the relevant module doesn't have support. The confdecl macros now have a CONF_CONTEXT that you can define to make all the modules in a given table disabled.	2019-12-19 07:54:56 -05:00
Nick Mathewson	5e2318165d	Add "stub" files for disabled modules. ... These modules are only built when the selected modules are disabled. The provide stub implementations of the subsystem blocks. Later, other stub implementations could move here. Having real subsystem blocks here will let us handle disabled configuration options better.	2019-12-19 07:54:56 -05:00
teor	5c98a42f49	Merge remote-tracking branch 'tor-github/pr/1584'	2019-12-19 19:33:29 +10:00
George Kadianakis	b7304027f6	Merge branch 'tor-github/pr/1587'	2019-12-18 14:19:15 +02:00
Nick Mathewson	08bfc2d71a	Merge branch 'ticket32172_once_again'	2019-12-17 15:02:06 -05:00
Peter Gerber	0d64bafcfe	Correct how we use libseccomp ... This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1.	2019-12-17 09:47:28 -05:00
Nick Mathewson	5f9808d1d7	Merge remote-tracking branch 'tor-github/pr/1596'	2019-12-17 09:39:50 -05:00
David Goulet	47d69d981e	Merge branch 'tor-github/pr/1608'	2019-12-17 09:30:19 -05:00
David Goulet	fa791b840a	Merge branch 'tor-github/pr/1609'	2019-12-17 09:26:49 -05:00
teor	11c8c4f23c	Merge branch 'pr1590_amended_commit'	2019-12-17 09:49:30 +10:00
Taylor Yu	616c0f823c	manpage: fixes to alphabetize General Options	2019-12-17 09:48:57 +10:00
George Kadianakis	e6bffeca64	Merge branch 'tor-github/pr/1591'	2019-12-16 22:01:10 +02:00
Mike Perry	e01e199005	Add changes file	2019-12-16 22:00:54 +02:00
Mike Perry	981350815d	Add circuit padding developer and quickstart docs.	2019-12-16 22:00:54 +02:00
Neel Chauhan	ec35593e42	Compact lines in test_e2e_rend_circuit_setup()	2019-12-16 14:26:12 -05:00
Neel Chauhan	f684fd79e9	Remove extra space from helper_get_circ_and_stream_for_test() call in test_e2e_rend_circuit_setup()	2019-12-16 14:19:55 -05:00
teor	55b25ee6c6	Merge branch 'bug32240_32242_042' into bug32240_32242_master ... Merge: * libzstd-dev from ticket32242_042 * coccinelle from master	2019-12-16 09:25:38 +10:00
teor	8b5c11fbf6	Merge branch 'bug32240_32242_041' into bug32240_32242_042	2019-12-16 09:23:46 +10:00
teor	84c4ede052	Merge branch 'bug32240_32242_040' into bug32240_32242_041	2019-12-16 09:23:41 +10:00
teor	d96b35d663	Merge branch 'bug32240_32242_035' into bug32240_32242_040 ... Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0	2019-12-16 09:22:52 +10:00
teor	0b3763612c	Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035	2019-12-16 09:21:05 +10:00
teor	86ca3194aa	Merge branch 'bug32240_042' into bug32240_master	2019-12-16 09:17:02 +10:00
teor	da404910a7	Merge branch 'bug32240_041' into bug32240_042 ... Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2	2019-12-16 09:15:42 +10:00
teor	4a34fd5b74	Merge branch 'bug32240_040' into bug32240_041	2019-12-16 09:14:38 +10:00
teor	e2f78396f4	Merge branch 'bug32240_035' into bug32240_040	2019-12-16 09:14:32 +10:00
teor	75096de4c7	Merge branch 'bug32240_029' into bug32240_035 ... Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5	2019-12-16 09:09:16 +10:00
teor	37b04aeed7	changes: file for 32240	2019-12-16 09:06:25 +10:00