8552 Commits

Author	SHA1	Message	Date
George Kadianakis	78e084a12e	Merge branch 'tor-github/pr/1267'	2019-08-27 11:47:46 +03:00
George Kadianakis	92a8573d22	Merge branch 'tor-github/pr/1258'	2019-08-27 11:45:18 +03:00
George Kadianakis	0d7f76d7ca	Merge branch 'tor-github/pr/1234'	2019-08-27 11:44:13 +03:00
George Kadianakis	5782cee71d	Merge branch 'tor-github/pr/1237'	2019-08-27 11:43:10 +03:00
Neel Chauhan	cc5af6dbd5	Add changes file for Bug #31088	2019-08-26 20:02:11 -04:00
Nick Mathewson	eff95429fd	Merge remote-tracking branch 'tor-github/pr/1241'	2019-08-26 10:15:25 -04:00
David Goulet	24bc2cd7b5	Merge branch 'tor-github/pr/1254'	2019-08-26 09:38:24 -04:00
Nick Mathewson	38c4e1426c	changes file for ticket30935	2019-08-26 09:33:29 -04:00
David Goulet	f95b5d07c1	hs-v3: Add changes file for prop305 implementation ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-26 15:53:46 +03:00
Nick Mathewson	7a45c9c1d2	Merge remote-tracking branch 'tor-github/pr/1215'	2019-08-24 16:30:55 -04:00
Nick Mathewson	f1707f7db3	Merge branch 'maint-0.4.1'	2019-08-24 16:29:23 -04:00
Neel Chauhan	14654d5c97	Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()	2019-08-23 14:04:05 -04:00
teor	41bc1fac8e	changes: file for 23507, v3 onion service fix	2019-08-23 16:25:33 +10:00
teor	084245134b	changes: file for 23818, v3 onion service fix	2019-08-23 15:10:45 +10:00
teor	14b5f40b54	Merge branch 'bug23818_029' into bug23818_035	2019-08-23 15:09:19 +10:00
teor	231a74363f	changes: file for 23818, v2 onion service fix	2019-08-23 15:08:43 +10:00
David Goulet	d475d7c2fb	Merge branch 'tor-github/pr/1244'	2019-08-22 17:10:22 -04:00
teor	5794523f80	changes: file for 21003 ... Log IPv6 addresses as well as IPv4 addresses, when describing routerinfos, routerstatuses, and nodes. Closes ticket 21003.	2019-08-23 00:06:55 +10:00
teor	7c92f4faa2	Merge branch 'bug31463_040' into bug31463_041	2019-08-22 22:10:06 +10:00
teor	8b32d22a07	Merge branch 'bug31463_035' into bug31463_040	2019-08-22 22:10:00 +10:00
Sebastian Hahn	190386f1c4	Fix gcc build exclude on travis ... The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one.	2019-08-22 22:09:32 +10:00
Nick Mathewson	cc48eff2d3	Merge branch 'ticket31176' into ticket31176_merged	2019-08-21 09:46:20 -04:00
Nick Mathewson	edf5a327c5	Merge branch 'ticket30914' into ticket30914_merged	2019-08-20 13:57:05 -04:00
Nick Mathewson	4b1e0dd5b5	remove changes files already contained in 0.4.1.5	2019-08-20 11:16:45 -04:00
Sebastian Hahn	360a29e282	Rust: Update version requirements and CI ... The #[global_allocator] attribute is not available in versions prior to 1.28.0, the default-linker-libraries feature requires rust 1.31.0. Adapt the CI to prevent accidental increases in Rust version by testing against 1.31.0, beta and nightly.	2019-08-20 07:16:46 +02:00
teor	bdcccb9776	scripts/git: Remove a duplicate practracker call from the pre-push hook ... The pre-push hook already calls the pre-commit hook, which calls practracker. Also update the script comments to avoid similar issues in future. Fixes bug 31462; bugfix on 0.4.1.1-alpha.	2019-08-20 12:21:02 +10:00
Nick Mathewson	87a3c5b110	Fix 64-bit return issue in parse_log_domain() ... If unsigned int is 32-bits long, then our old code would give a wrong result with any log domain whose mask was >= (1<<32). Fortunately, there are no such log domains right now: the domain mask is only 64 bits long to accommodate some flags. Found by coverity as CID 1452041. Fixes bug 31451; bugfix on 0.4.1.4-rc.	2019-08-19 13:59:57 -04:00
Nick Mathewson	6a89b01049	Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1	2019-08-19 11:11:32 -04:00
Nick Mathewson	e7aabfce61	Merge remote-tracking branch 'tor-github/pr/1235'	2019-08-19 11:10:21 -04:00
George Kadianakis	60adebc499	Merge branch 'tor-github/pr/1217'	2019-08-19 18:07:48 +03:00
George Kadianakis	4185ef29fd	Merge branch 'tor-github/pr/1122'	2019-08-19 18:06:05 +03:00
George Kadianakis	19e19c1fa8	Merge branch 'tor-github/pr/1154'	2019-08-19 18:03:51 +03:00
George Kadianakis	e411fcabd7	Merge branch 'tor-github/pr/1220'	2019-08-19 18:02:44 +03:00
George Kadianakis	b257e8e553	Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final	2019-08-19 17:53:00 +03:00
Nick Mathewson	c214402a56	Merge branch 'maint-0.4.1'	2019-08-19 10:37:22 -04:00
Nick Mathewson	90f4ed2335	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-08-19 10:37:21 -04:00
Nick Mathewson	5653b93a1d	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-08-19 10:37:21 -04:00
Nick Mathewson	bba64c9882	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-08-19 10:37:21 -04:00
David Goulet	81e37b81f1	practracker: Make exceptions.txt happy ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-19 09:47:52 -04:00
David Goulet	5a1c3e44f7	dirauth: Change dizum IP address ... New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-08-15 08:20:47 -04:00
Mike Perry	02c89c955d	Bug 31356: Add changes file. ... Also document the other log changes in this branch.	2019-08-12 14:06:08 -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	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
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
George Kadianakis	519556ef2c	Fix #28525 changes file that is breaking CI.	2019-08-09 13:55:31 +10:00
George Kadianakis	c35aded00a	Fix #28525 changes file that is breaking CI.	2019-08-09 13:55:19 +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	7502881deb	Merge branch 'bug31343_31374_035' into bug31343_31374_040	2019-08-09 09:51:40 +10:00
teor	e609f00342	Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040	2019-08-09 09:50:50 +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	4665ac9ec7	Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035	2019-08-09 09:49:27 +10:00
teor	2bc8989d83	Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029	2019-08-09 09:48:41 +10:00
teor	7667c1cbaf	Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029	2019-08-09 09:48:28 +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	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	71e5af0221	pre-push hook: Only run practracker when a special file is present ... Closes ticket 30979.	2019-08-08 11:36:05 -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
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	d6202d3128	scripts/git: add TOR_PUSH_DELAY to git-push-all.sh ... Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script push master and maint branches with a delay between each branch. These delays trigger the CI jobs in a set order, which should show the most likely failures first. Also: * make pushes atomic by default, and * make the script pass any command-line arguments to git push. Closes ticket 29879.	2019-08-08 18:59:44 +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	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	25c97b18f1	changes file for ticket 31320	2019-08-06 13:13:36 -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	21531f35f3	Merge branch 'ticket31311_041' into maint-0.4.1	2019-08-06 09:19:05 -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	d515b0f4ba	changes file for ticket 31176	2019-08-05 17:48:06 -04:00
Nick Mathewson	9a1e9b1d6c	Teach practracker about .h files ... I'm using 500 as a file size limit, and 15 as an include limit. This affects comparatively few files, but I think they are the worst ones. Closes ticket 31175.	2019-08-05 10:31:02 -04:00
Nick Mathewson	54ad92a240	Merge branch 'maint-0.4.1'	2019-08-05 09:59:40 -04:00
George Kadianakis	74c0595965	Ignore regular cells in padding circuits. ... Padding circuits were regular cells that got closed before their padding machine could finish. This means that they can still receive regular cells from their past life, but they have no way or reason to answer them anymore. Hence let's ignore them before they even get to the proper subsystems.	2019-08-05 13:48:58 +03:00
Nick Mathewson	fa60fee8d5	practracker: Add unit tests to test script, and test script to makefile ... This makes all of the practracker tests get run by make check, and hence by our CI. Closes ticket 31304.	2019-08-01 14:01:43 -04:00
Nick Mathewson	49c696fb46	Merge branch 'ticket31311_041' into ticket31304	2019-08-01 13:48:58 -04:00
Nick Mathewson	3945282419	make dist: only include files from practracker dir intentionally. ... Previously, we included temporary files and whatnot, which is not good. Fixes bug 31311; bugfix on 0.4.1.1-alpha.	2019-08-01 13:47:05 -04:00
Nick Mathewson	223afc2d8f	practracker: add envvar TOR_PRACTRACKER_OPTIONS ... We have Makefile.am use this to decide how to invoke practracker on the Tor source.	2019-08-01 12:57:26 -04:00
David Goulet	c4864de573	Merge branch 'tor-github/pr/1177'	2019-08-01 10:18:10 -04:00
Nick Mathewson	19536fd18d	practracker: replaces "overstrict" with "overbroad" ... I had the logic reversed here.	2019-08-01 09:35:33 -04:00
David Goulet	6dba86d7c9	Merge branch 'maint-0.4.1'	2019-07-29 12:02:54 -04:00
David Goulet	1d6054f750	Merge branch 'tor-github/pr/1179' into maint-0.4.1	2019-07-29 12:02:47 -04:00
David Goulet	044bb019b6	Merge branch 'maint-0.4.1'	2019-07-25 10:27:41 -04:00
George Kadianakis	af26cd6101	Always check the retval of circpad_machine_current_state().	2019-07-25 10:24:23 -04:00
George Kadianakis	bd1ac408d8	Remove dead code from circpad_machine_remove_token().	2019-07-25 10:24:19 -04:00
David Goulet	cfb15d513d	Merge branch 'maint-0.4.1'	2019-07-25 09:03:01 -04:00
David Goulet	2a4b156978	Merge branch 'tor-github/pr/1171' into maint-0.4.1	2019-07-25 09:02:53 -04:00
George Kadianakis	2944b091fc	Merge branch 'maint-0.4.1'	2019-07-24 12:32:06 +03:00
George Kadianakis	bb33a2f290	Merge branch 'tor-github/pr/1181' into maint-0.4.1	2019-07-24 12:31:56 +03:00
George Kadianakis	91f04d006b	Merge branch 'tor-github/pr/1165'	2019-07-24 12:29:57 +03:00
Nick Mathewson	ab1f82ea2a	Merge branch 'ticket24963_042_02'	2019-07-23 14:03:30 -04:00
Nick Mathewson	ab1f39322c	Merge remote-tracking branch 'tor-github/pr/1185'	2019-07-23 12:32:14 -04:00
Nick Mathewson	f6db290e5a	Merge remote-tracking branch 'tor-github/pr/1186'	2019-07-23 12:30:19 -04:00
David Goulet	ef2dd1ba96	Merge branch 'tor-github/pr/1116'	2019-07-23 09:46:29 -04:00
David Goulet	2fce1274de	Merge branch 'tor-github/pr/1153'	2019-07-23 09:43:36 -04:00
David Goulet	f7dc920f4b	Merge branch 'maint-0.4.1'	2019-07-23 09:39:51 -04:00
David Goulet	c541258fac	Merge branch 'tor-github/pr/1158' into maint-0.4.1	2019-07-23 09:39:43 -04:00
George Kadianakis	fdfee3d06f	Changes file for #31113.	2019-07-23 12:44:43 +03:00
Mike Perry	ec38b662f2	Bug 30649: Changes file.	2019-07-23 12:22:23 +03:00
George Kadianakis	aed82bf410	Add changes file for #31112 and #31098.	2019-07-23 11:52:25 +03:00
Nick Mathewson	a9379d6750	Set 'routerlist' global to NULL before freeing it. ... There is other code that uses this value, and some of it is apparently reachable from inside router_dir_info_changed(), which routerlist_free() apparently calls. (ouch!) This is a minimal fix to try to resolve the issue without causing other problems. Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where the call to router_dir_info_changed() was added to routerlist_free().	2019-07-19 09:49:52 -04:00
Nick Mathewson	8bbec36b3b	Changes file for bug 31001	2019-07-19 09:21:45 -04:00
Nick Mathewson	3efe5cc57a	changes file for 30752	2019-07-18 09:28:08 -04:00
Nick Mathewson	78768aafe1	Changes file for 29746.	2019-07-18 09:28:08 -04:00
rl1987	ffce19a9ec	Make tor-print-ed-signing-cert output RFC1123 and unix timestamps as well	2019-07-10 11:36:26 +03:00
Nick Mathewson	09c692e72b	Use a 64-bit mask for log domains, and fix a conflict ... When we added LD_MESG, we created a conflict with the LD_NO_MOCK flag. We now need 64 bits for log domains in order to fix this issue. Fixes bug 31080; bugfix on 0.4.1.1-alpha.	2019-07-08 13:32:45 -04:00
George Kadianakis	5303dbe624	Merge branch 'tor-github/pr/1152'	2019-07-04 17:14:06 +03:00
David Goulet	ef2123c7c7	hs-v3: Disallow single hop client to post/get a descriptor ... Closes #24964 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-07-03 08:21:16 -04:00
Nick Mathewson	fdbd139495	Merge remote-tracking branch 'tor-github/pr/1136'	2019-07-02 13:33:50 -04:00
Nick Mathewson	cf92c096ad	Merge remote-tracking branch 'tor-github/pr/1120'	2019-07-02 13:33:37 -04:00
rl1987	59e523f058	Early exit from post-merge git hook script when not merging to master	2019-07-02 20:06:23 +03:00
George Kadianakis	15e28af2d1	Merge remote-tracking branch 'dgoulet/ticket31008_035_01'	2019-07-02 13:19:40 +03:00
Nick Mathewson	c0ea6f9c64	Merge branch 'maint-0.4.1'	2019-07-01 14:25:13 -04:00
Nick Mathewson	2a42d6be27	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-07-01 14:25:12 -04:00
Nick Mathewson	1dd9527897	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-07-01 14:25:12 -04:00
Nick Mathewson	5e16601000	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-07-01 14:25:12 -04:00