33011 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	70d0b97ee6	Merge branch 'ticket31343_029' into ticket31343_035	2019-08-08 09:17:23 -04:00
Nick Mathewson	cd6cb45372	Restore proper behavior of netinfo skew check ... My previous fix removed a comparison, which would have caused us to warn about every skew instead of skews of over an hour.	2019-08-08 09:15:42 -04:00
teor	320f5068a0	Merge branch 'doc31089_041' into doc31089_master ... Delete outdated comment about serving the image, which had been modified earlier in the master branch.	2019-08-08 23:08:19 +10:00
teor	fcb4d273fb	Merge branch 'doc31089_040' into doc31089_041	2019-08-08 23:07:22 +10:00
teor	c3d6c75945	Merge branch 'doc31089_035' into doc31089_040	2019-08-08 23:07:17 +10:00
teor	25f39bdfc4	Merge branch 'doc31089_029' into doc31089_035	2019-08-08 23:07:12 +10:00
rl1987	1087c48d6e	Hardcode the image into tor-exit-notice.html	2019-08-08 22:46:51 +10:00
teor	0acfd7dcee	Merge branch 'maint-0.4.1'	2019-08-08 11:20:07 +10:00
teor	40d7f1e3a6	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-08-08 11:19:58 +10:00
teor	0a661cde1d	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-08 11:19:38 +10:00
teor	e83eabc9bf	Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 ... Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591.	2019-08-08 11:17:46 +10:00
teor	5cbc0b3881	Merge branch 'maint-0.4.1'	2019-08-08 11:11:42 +10:00
teor	6d0883e9e9	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-08-08 11:11:35 +10:00
teor	e27a74b1b1	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-08 11:11:27 +10:00
teor	1bc2ae7be7	Merge branch 'maint-0.2.9' into maint-0.3.5 ... Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.	2019-08-08 11:10:15 +10:00
teor	97e7be2717	Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0	2019-08-08 11:07:34 +10:00
teor	e15b9b1790	Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5	2019-08-08 11:07:11 +10:00
teor	8d22c09abf	Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9	2019-08-08 10:55:24 +10:00
teor	518b69b57c	Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9	2019-08-08 10:54:12 +10:00
Nick Mathewson	35cfe2e776	Merge remote-tracking branch 'tor-github/pr/1208'	2019-08-07 09:49:49 -04:00
Nick Mathewson	25c97b18f1	changes file for ticket 31320	2019-08-06 13:13:36 -04:00
Nick Mathewson	f557680aa9	Merge remote-tracking branch 'tor-github/pr/1203'	2019-08-06 13:12:42 -04:00
Nick Mathewson	484b654048	test_token_bucket: negate after casting to signed type. ... Previously we tried multiplying by -1 before casting to int32_t, which would cause us to cast the -1 to an unsigned before we multiplied. This gave us compiler warnings on windows. Fixes bug 31353; bug not in any released Tor.	2019-08-06 11:42:04 -04:00
Nick Mathewson	66437710af	test_util: Do not check for ENETUNREACH unless it exists. ... Fixes bug 31352; bug not in any released Tor.	2019-08-06 11:35:50 -04:00
Nick Mathewson	79569d86b3	Merge branch 'ticket31343_035' into ticket31343_040	2019-08-06 11:18:40 -04:00
Nick Mathewson	bc9492a938	Merge branch 'ticket31343_029' into ticket31343_035	2019-08-06 11:15:20 -04:00
Nick Mathewson	0849d2a2fd	Avoid using labs() on time_t in channeltls.c ... On some windows builds, time_t is 64 bits but long is not. This is causing appveyor builds to fail. Also, one of our uses of labs() on time_t was logically incorrect: it was telling us to accept NETINFO cells up to three minutes _before_ the message they were responding to, which doesn't make sense. This patch adds a time_abs() function that we should eventually move to intmath.h or something. For now, though, it will make merges easier to have it file-local in channeltls.c. Fixes bug 31343; bugfix on 0.2.4.4-alpha.	2019-08-06 11:11:06 -04:00
Nick Mathewson	88f9b123d6	Merge branch 'maint-0.4.1'	2019-08-06 09:19:11 -04:00
Nick Mathewson	21531f35f3	Merge branch 'ticket31311_041' into maint-0.4.1	2019-08-06 09:19:05 -04:00
David Goulet	2b225aaa77	practracker: Make it happy after rebase ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 08:01:26 -04:00
David Goulet	c45f0b4ec1	hs-v3: Rename HS DoS default defines ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	90b5422e8e	test: Series of fixes for hs_dos.c unit tests ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	e537968548	dos: Update HS intro circuits if parameters change ... In case the consensus parameters for the rate/burst changes, we need to update all already established introduction circuits to the newest value. This commit introduces a "get all intro circ" function from the HS circuitmap (v2 and v3) so it can be used by the HS DoS module to go over all circuits and adjust the INTRODUCE2 token bucket parameters. Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	be8bd2a46e	hs-v3: Add enable/disable HS DoS introduce parameter ... Following prop305 values. Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	c5b00c5a51	hs-v3: Add consensus parameters for DoS defenses ... Part of #15516 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	fec0a7b7cb	test: Add hs_dos.c unit tests ... Currently test the only available function which is hs_dos_can_send_intro2() within the HS anti-DoS subsystem. Closes #15516 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
David Goulet	9f738be893	hs: Limit the amount of relayed INTRODUCE2 ... This commit add the hs_dos.{c|h} file that has the purpose of having the anti-DoS code for onion services. At this commit, it only has one which is a function that decides if an INTRODUCE2 can be sent on the given introduction service circuit (S<->IP) using a simple token bucket. The rate per second is 25 and allowed burst to 200. Basic defenses on #15516. Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-06 07:58:14 -04:00
George Kadianakis	d7afdb3b0f	Merge branch 'tor-github/pr/1195'	2019-08-06 14:51:47 +03:00
David Goulet	4ee65a6f87	Merge branch 'tor-github/pr/1193'	2019-08-06 07:42:20 -04:00
Nick Mathewson	0f4b245b20	update exceptions file for depencency violations	2019-08-05 17:48:06 -04:00
Nick Mathewson	d515b0f4ba	changes file for ticket 31176	2019-08-05 17:48:06 -04:00
Nick Mathewson	a5971d732e	Move include-violation checking into its own function.	2019-08-05 17:48:06 -04:00
Nick Mathewson	2a3c727dfe	Make includes interface more like the rest of practracker ... Everything else assumes that somebody else will open the file for it.	2019-08-05 17:48:06 -04:00
Nick Mathewson	6b26281b50	practracker: a violation of a .may_include rule is now a problem. ... We treat "0" as the expected number, and warn about everything else. The problem type is "dependency-violation".	2019-08-05 17:48:06 -04:00
Nick Mathewson	720951f056	Teach include-checker about advisory rules ... A .may_includes file can be "advisory", which means that some violations of the rules are expected. We will track these violations with practracker, not as automatic errors.	2019-08-05 17:04:00 -04:00
Ali Raheem	57c34e80da	#31320 Add IPv6 examples	2019-08-05 19:24:42 +01:00
Nick Mathewson	9abbde2c24	Update pre-commit hook to find checkIncludes in its new location ... Also add a temporary script to redirect the hook, if people don't upgrade for a bit.	2019-08-05 14:12:39 -04:00
Nick Mathewson	6fb74753c2	Move checkIncludes inside practracker ... Update the makefile accordingly.	2019-08-05 14:10:40 -04:00
Nick Mathewson	9eb12dde18	checkIncludes: add a real main function and CLI	2019-08-05 13:40:59 -04:00
Nick Mathewson	3f4e89a7ab	checkIncludes: refactor to use error-iteration style ... This makes checkIncludes match practracker more closely, and lets us eliminate a global.	2019-08-05 13:40:59 -04:00