24527 commits

Author	SHA1	Message	Date
Mike Perry	f6bc9d7c7e	Bug 30992: Demote logline of wronghop padding to protocol warn. ... This can happen, it's not great, but it's not the worst thing in the world either. Deferring full fix for 0.4.2/later.	2019-08-12 13:46:32 -05:00
Mike Perry	ccd16caeac	Additional circpad diagnostic logs ... Also add controller circuit id to all relevant circpad loglines. This will make debugging any future issues like #30992 much easier.	2019-08-12 13:46:32 -05:00
teor	20943d00f1	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-12 13:10:05 +10:00
teor	a1d8409ee2	Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0	2019-08-12 09:55:29 +10:00
teor	d253b31cec	Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5	2019-08-12 09:54:35 +10:00
teor	31fb2bceb5	Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5	2019-08-12 09:53:59 +10:00
teor	789fdbed05	Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5	2019-08-12 09:52:56 +10:00
teor	a92b05392e	Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5	2019-08-12 09:51:35 +10:00
teor	224825e7ee	Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5	2019-08-12 09:51:00 +10:00
teor	e5be039494	Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5	2019-08-12 09:50:42 +10:00
teor	f65f4b5c38	Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5	2019-08-12 09:49:53 +10:00
teor	8ea0903222	Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5	2019-08-12 09:45:32 +10:00
teor	6ed56ee4ea	Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5	2019-08-12 09:44:46 +10:00
teor	2d4772dc47	Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5	2019-08-12 09:43:37 +10:00
teor	ef345ab56d	Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5	2019-08-12 09:42:15 +10:00
teor	9be65c440b	Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5	2019-08-12 09:41:14 +10:00
teor	955cf9620c	Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5	2019-08-12 09:40:08 +10:00
teor	3287cae68c	Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5	2019-08-12 09:38:46 +10:00
teor	a57e168caa	Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5	2019-08-12 09:36:14 +10:00
teor	bad0010808	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-10 07:26:21 +10:00
teor	254c1bac45	Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9	2019-08-10 07:21:56 +10:00
teor	e07d08a169	Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9	2019-08-10 07:21:43 +10:00
teor	e0f9a8222b	Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9	2019-08-10 07:21:31 +10:00
Nick Mathewson	37bd7fa50d	Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9	2019-08-10 07:16:42 +10:00
teor	8a4635a5fe	Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0	2019-08-09 14:05:46 +10:00
teor	654769bcec	Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5	2019-08-09 14:05:26 +10:00
teor	1ba2bd3599	Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5	2019-08-09 14:01:50 +10:00
teor	e3ba9b7a78	Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5	2019-08-09 14:00:01 +10:00
teor	1a9555e283	Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5	2019-08-09 13:53:52 +10:00
teor	45f30ba5fa	Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9	2019-08-09 13:53:34 +10:00
teor	05018d55ca	Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9	2019-08-09 13:50:42 +10:00
teor	7502881deb	Merge branch 'bug31343_31374_035' into bug31343_31374_040	2019-08-09 09:51:40 +10:00
teor	65343a966e	Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035	2019-08-09 09:49:35 +10:00
teor	2bc8989d83	Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029	2019-08-09 09:48:41 +10:00
Nick Mathewson	0e1fd6d61f	Merge branch 'maint-0.4.1'	2019-08-08 15:25:00 -04:00
Nick Mathewson	53d5b67f07	Merge branch 'ticket31374_035' into maint-0.4.1	2019-08-08 15:24:52 -04:00
David Goulet	2e5519da7c	hs: Initialize the INTRO2 bucket for legacy intro point ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-08 13:40:10 -04:00
Neel	64d2133a61	Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell()	2019-08-08 13:05:46 -04:00
David Goulet	b47adcbcab	Merge branch 'tor-github/pr/1183'	2019-08-08 12:30:23 -04:00
David Goulet	0312da75a3	Merge branch 'tor-github/pr/1172'	2019-08-08 12:26:59 -04:00
Nick Mathewson	b560d94ac0	Merge branch 'ticket31374_029' into ticket31374_035	2019-08-08 11:46:24 -04:00
Nick Mathewson	3a280b35ee	Fix a warning about casting the results of GetProcAddress. ... Fixes bug 31374; bugfix on 0.2.9.1-alpha.	2019-08-08 11:44:19 -04:00
Nick Mathewson	a8f936c817	Merge branch 'maint-0.4.1'	2019-08-08 11:24:08 -04:00
Nick Mathewson	0bc5b7ae95	Merge branch 'ticket31343_040' into maint-0.4.1	2019-08-08 11:23:59 -04:00
Nick Mathewson	7e32db478b	Merge branch 'ticket31343_035' into ticket31343_040	2019-08-08 09:40:04 -04:00
Nick Mathewson	a4400a77a5	Merge branch 'ticket31343_029' into ticket31343_035	2019-08-08 09:39:48 -04:00
Nick Mathewson	878f440901	Fix another time_t/long warning for 31343.	2019-08-08 09:38:03 -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
Nick Mathewson	35cfe2e776	Merge remote-tracking branch 'tor-github/pr/1208'	2019-08-07 09:49:49 -04:00
Nick Mathewson	f557680aa9	Merge remote-tracking branch 'tor-github/pr/1203'	2019-08-06 13:12:42 -04:00