nihilist/tor - tor - Git with a cup of Datura seeds

mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 23:33:31 +01:00

Author	SHA1	Message	Date
Nick Mathewson	af56dece09	Merge branch 'maint-0.4.0'	2019-03-15 08:53:03 -04:00
Nick Mathewson	94523bffdc	Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0	2019-03-15 08:52:50 -04:00
Roger Dingledine	a3bc950e42	relays shouldn't close idle rend circuits Allow connections to single onion services to remain idle without being disconnected. Relays acting as rendezvous points for single onion services were mistakenly closing idle established rendezvous circuits after 60 seconds, thinking that they are unused directory-fetching circuits that had served their purpose. Fixes bug 29665; bugfix on 0.2.1.26.	2019-03-14 12:54:16 +02:00
Roger Dingledine	add0f89c14	relays shouldn't close idle rend circuits Allow connections to single onion services to remain idle without being disconnected. Relays acting as rendezvous points for single onion services were mistakenly closing idle established rendezvous circuits after 60 seconds, thinking that they are unused directory-fetching circuits that had served their purpose. Fixes bug 29665; bugfix on 0.2.1.26.	2019-03-14 12:53:33 +02:00
teor	e021f89f36	Merge branch 'maint-0.2.9' into maint-0.3.4	2019-03-14 06:56:38 +10:00
teor	f3b17a6b26	Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4	2019-03-14 06:56:09 +10:00
teor	c03b1b3f08	Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4	2019-03-14 06:55:57 +10:00
teor	66f944f79b	Merge branch 'bug28096-029-squashed' into bug28096-034-squashed Merge the new code, and preserve the #else macro comment from 0.3.4.	2019-03-14 06:53:17 +10:00
teor	2840580cf2	Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034 Replace == with OP_EQ in test macros.	2019-03-14 06:47:32 +10:00
teor	5606cfae47	Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4	2019-03-14 06:41:14 +10:00
teor	8bd9b2a6a0	Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9	2019-03-14 06:37:50 +10:00
teor	90301247fd	Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9	2019-03-14 06:37:17 +10:00
teor	530304dd77	Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9	2019-03-14 06:36:47 +10:00
teor	eaa84234c9	Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9	2019-03-14 06:36:11 +10:00
teor	9daae1b302	Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9	2019-03-14 06:35:05 +10:00
George Kadianakis	26b0d95397	Merge branch 'tor-github/pr/780'	2019-03-13 16:07:19 +02:00
Nick Mathewson	58fd864a85	Merge remote-tracking branch 'tor-github/pr/705'	2019-03-13 09:36:47 -04:00
Nick Mathewson	17ff69a268	Merge branch 'bug29221_more_squashed'	2019-03-13 09:30:02 -04:00
Nick Mathewson	504aef6228	Changes file for practracker (29221)	2019-03-13 09:29:10 -04:00
Nick Mathewson	95209be861	Make checkSpace.pl check guard macros: - every .h file needs an #ifndef/#define pair. - They must refer to the same macro. - The guard macros that they refer to must be unique across all headers.	2019-03-12 15:19:28 -04:00
Nick Mathewson	cd52e13946	Merge branch 'maint-0.4.0'	2019-03-12 14:22:08 -04:00
George Kadianakis	ec2a2a6b7a	Fix #28525 changes file that is breaking CI.	2019-03-12 20:11:51 +02:00
George Kadianakis	18a4f535d3	Merge branch 'maint-0.4.0'	2019-03-12 18:11:53 +02:00
George Kadianakis	0ce32affc2	Merge branch 'tor-github/pr/763' into maint-0.4.0	2019-03-12 18:11:35 +02:00
Nick Mathewson	61adcb22c5	Merge branch 'bug23576-041-rebased-squashed'	2019-03-12 11:10:01 -04:00
teor	257cea8876	test/hs: minor hs test fixes Cleanup some bugs discovered during 23576: * stop copying the first 20 characters of a 40-character hex string to a binary fingerprint * stop putting IPv6 addresses in a variable called "ipv4" * explain why we do a duplicate tt_int_op() to deliberately fail and print a value Fixes bug 29243; bugfix on 0.3.2.1-alpha.	2019-03-12 11:09:53 -04:00
teor	bb98bc8562	hs: abolish hs_desc_link_specifier_t The previous commits for 23576 confused hs_desc_link_specifier_t and link_specifier_t. Removing hs_desc_link_specifier_t fixes this confusion. Fixes bug 22781; bugfix on 0.3.2.1-alpha.	2019-03-12 11:09:53 -04:00
Nick Mathewson	1c9b629284	Merge branch 'maint-0.4.0'	2019-03-12 11:03:47 -04:00
Nick Mathewson	9c9214f2c9	Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0	2019-03-12 11:03:37 -04:00
teor	c7854933e9	Merge branch bug29706_029_refactor into bug29706_034_refactor	2019-03-12 11:31:52 +10:00
rl1987	134a640a91	Remove linux-tor-prio.sh script	2019-03-10 19:12:47 +02:00
rl1987	73fed3ee1c	Add changes file	2019-03-10 18:28:06 +02:00
teor	26e6f56023	sr: Free SRVs before replacing them in state_query_put_() Refactor the shared random state's memory management so that it actually takes ownership of the shared random value pointers. Fixes bug 29706; bugfix on 0.2.9.1-alpha.	2019-03-09 12:03:00 +10:00
teor	9400da9b5e	test/sr: Free SRVs before replacing them in test_sr_setup_srv() Stop leaking parts of the shared random state in the shared-random unit tests. The previous fix in 29599 was incomplete. Fixes bug 29706; bugfix on 0.2.9.1-alpha.	2019-03-09 11:59:52 +10:00
Nick Mathewson	c40d53ab39	Merge branch 'pr_719_squashed_040' into maint-0.4.0	2019-03-08 10:25:43 -05:00
Mike Perry	ff410edec0	Bug 29204: Inspect circuit queues before sending padding. Mitigates OOM conditions at relays.	2019-03-08 10:25:28 -05:00
Nick Mathewson	e47e60c12e	Merge branch 'pr_719_squashed'	2019-03-08 10:24:00 -05:00
Mike Perry	cd67911033	Bug 29204: Inspect circuit queues before sending padding. Mitigates OOM conditions at relays.	2019-03-08 10:23:47 -05:00
David Goulet	b4e44a371f	hs-v2: Copy needed information between service on prunning Turns out that when reloading a tor configured with hidden service(s), we weren't copying all the needed information between the old service object to the new one. For instance, the desc_is_dirty timestamp wasn't which could lead to the service uploading its descriptor much later than it would need to. The replaycache wasn't also moved over and some intro point information as well. Fixes #23790 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-03-08 09:59:04 -05:00
teor	ffd7207025	Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5	2019-03-08 14:11:14 +10:00
teor	08ddf1f62b	Merge remote-tracking branch 'bug28525_029' into maint-0.3.5	2019-03-08 12:33:00 +10:00
Neel Chauhan	63b4049114	Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware Fixes 28525.	2019-03-08 12:19:12 +10:00
Nick Mathewson	d3fc9aef93	Merge branch 'maint-0.4.0'	2019-03-07 08:57:02 -05:00
Nick Mathewson	3af943dcd1	Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0	2019-03-07 08:56:35 -05:00
Nick Mathewson	82e1ec4087	Merge branch 'maint-0.4.0'	2019-03-07 08:34:46 -05:00
Nick Mathewson	d8409ccb76	Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0	2019-03-07 08:34:15 -05:00
Nick Mathewson	918bda25ad	Merge branch 'maint-0.4.0'	2019-03-06 14:29:48 -05:00
Nick Mathewson	9b4ecbaa7d	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-03-06 14:29:43 -05:00
Nick Mathewson	d6f77b99da	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-03-06 14:29:38 -05:00
Nick Mathewson	155b0f5521	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-03-06 14:29:33 -05:00
Nick Mathewson	0c9cd7c487	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-03-06 14:29:29 -05:00
Karsten Loesing	2e74edb53e	Update geoip and geoip6 to the March 4 2019 database.	2019-03-06 11:45:27 +01:00
David Goulet	db2e916afe	Merge branch 'tor-github/pr/717'	2019-03-05 14:26:59 -05:00
rl1987	ae5a0f39cd	Update git pre-push hook so that only upstream branches can get pushed to origin	2019-03-05 14:26:09 -05:00
Nick Mathewson	f1890707cc	Merge branch 'maint-0.4.0'	2019-03-05 13:00:07 -05:00
David Goulet	a999cb43df	protover: Add missing Padding to translate_to_rust This commit also explicitly set the value of the PRT enum so we can match/pin the C enum values to the Rust one in protover/ffi.rs. Fixes #29631 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-03-05 12:33:43 -05:00
Nick Mathewson	d24acc008d	Merge remote-tracking branch 'tor-github/pr/759'	2019-03-05 12:01:28 -05:00
Nick Mathewson	f8e38d21c2	Merge remote-tracking branch 'tor-github/pr/753'	2019-03-05 11:57:20 -05:00
Nick Mathewson	72751f0c30	Merge remote-tracking branch 'tor-github/pr/680'	2019-03-05 11:53:31 -05:00
Alexander Færøy	c9a9de120f	Fix changelog for ticket 25614 to make it pass check-changes. Yawning's commit in `fda61e030e` was used to find which version this is a bugfix on.	2019-03-05 15:50:30 +01:00
David Fifield	4578c3eb21	Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too. Closes #25614.	2019-03-05 15:24:31 +01:00
George Kadianakis	fe2552ad65	Merge branch 'tor-github/pr/739'	2019-03-04 18:52:19 +02:00
teor	e52d725977	doc: Improve the monotonic time module and function documentation Explain what "monotonic" actually means, and document some results that have surprised people. Fixes bug 29640; bugfix on 0.2.9.1-alpha.	2019-03-04 11:25:14 +10:00
rl1987	27eec50527	manpage: fix formatting of example on quoting options with spaces	2019-03-03 11:51:08 +02:00
rl1987	5d53862139	Split crypto_digest.c * Move out code that depends on NSS to crypto_digest_nss.c * Move out code that depends on OpenSSL to crypto_digest_openssl.c * Keep the general code that is not specific to any of the above in crypto_digest.c	2019-03-02 20:07:05 +02:00
David Goulet	13e93bdfd5	Merge branch 'tor-github/pr/718'	2019-03-01 09:36:23 -05:00
Nick Mathewson	cb0d403049	Merge remote-tracking branch 'tor-github/pr/677'	2019-03-01 08:22:43 -05:00
teor	7786198eef	Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9	2019-03-01 14:15:00 +10:00
teor	c1ab538479	Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9	2019-03-01 14:14:51 +10:00
teor	ecbc2e80a0	Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9	2019-03-01 14:14:26 +10:00
Mike Perry	e8d84b18aa	Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert.	2019-03-01 13:48:01 +10:00
Kris Katterjohn	389ee834b6	Log the correct "auto" port number for listening sockets When "auto" was used for the port number for a listening socket, the message logged after opening the socket would incorrectly say port 0 instead of the actual port used. Fixes bug 29144; bugfix on 0.3.5.1-alpha Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-03-01 12:34:21 +10:00
Nick Mathewson	d5f6137547	Merge branch 'maint-0.4.0'	2019-02-28 11:22:06 -05:00
Nick Mathewson	dc19d65c3b	Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0	2019-02-28 11:20:26 -05:00
George Kadianakis	cec555f44c	Merge branch 'tor-github/pr/720'	2019-02-28 12:32:16 +02:00
teor	be29dfedd9	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-02-28 10:45:59 +10:00
teor	524731503e	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-02-28 10:45:44 +10:00
teor	3313444ef0	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-02-28 10:45:30 +10:00
Neel Chauhan	c142e3d1e6	Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()	2019-02-27 17:37:10 -05:00
teor	a479909ee8	appveyor: skip two redundant builds to speed up CI on Windows Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows Server 2012 R2 job. The remaining 2 jobs still provide coverage of 64/32-bit, and Windows Server 2016/2012 R2. Also set fast_finish, so failed jobs terminate the build immediately. Fixes bug 29601; bugfix on 0.3.5.4-alpha.	2019-02-28 07:43:57 +10:00
Nick Mathewson	761eb4cf79	Merge branch 'maint-0.4.0'	2019-02-27 09:59:42 -05:00
Nick Mathewson	56f01e58b4	Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0	2019-02-27 09:59:33 -05:00
teor	64e082e892	Merge branch 'bug29599_029' into bug29599_033	2019-02-27 15:06:39 +10:00
teor	4d9eb4dd0e	test/shared-random: Stop leaking shared random state in the unit tests Stop leaking parts of the shared random state in the shared-random unit tests. Fixes bug 29599; bugfix on 0.2.9.1-alpha.	2019-02-27 15:04:40 +10:00
teor	15dc33849e	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-02-27 09:38:04 +10:00
teor	1a194beb2c	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-02-27 09:37:50 +10:00
teor	6c966b894c	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-02-27 09:37:36 +10:00
George Kadianakis	39a1049932	Merge branch 'tor-github/pr/729'	2019-02-26 20:15:40 +02:00
David Goulet	b402a0887f	Merge branch 'tor-github/pr/655'	2019-02-26 11:30:44 -05:00
David Goulet	2a44ee9b8c	Merge branch 'maint-0.4.0'	2019-02-26 11:25:16 -05:00
David Goulet	a5dd41b9af	Merge branch 'tor-github/pr/638' into maint-0.4.0	2019-02-26 11:24:43 -05:00
David Goulet	e1ad22643e	maint: Helpful scripts for tor maintenance Closes #29391 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-02-26 10:52:25 -05:00
David Goulet	9c4ec414bd	Merge branch 'tor-github/pr/692' into maint-0.4.0	2019-02-26 10:47:54 -05:00
David Goulet	1216f99534	Merge branch 'tor-github/pr/691' into maint-0.3.5	2019-02-26 10:46:52 -05:00
Alexander Færøy	aa360b255b	Fix crash bug in PT subsystem. This patch fixes a crash bug (assertion failure) in the PT subsystem that could get triggered if the user cancels bootstrap via the UI in TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which called `process_free()` after it had called `process_terminate()`. This leads to a crash when the various process callbacks returns with data after the `process_t` have been freed using `process_free()`. We solve this issue by ensuring that everywhere we call `process_terminate()` we make sure to detach the `managed_proxy_t` from the `process_t` (by calling `process_set_data(process, NULL)`) and avoid calling `process_free()` at all in the transports code. Instead we just call `process_terminate()` and let the process exit callback in `managed_proxy_exit_callback()` handle the `process_free()` call by returning true to the process subsystem. See: https://bugs.torproject.org/29562	2019-02-26 15:43:09 +01:00
Nick Mathewson	732855c2e5	Merge branch 'maint-0.4.0'	2019-02-26 07:27:50 -05:00
Nick Mathewson	35257a1c69	Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0	2019-02-26 07:27:42 -05:00
George Kadianakis	57d33b5786	Merge branch 'tor-github/pr/698'	2019-02-26 12:35:14 +02:00
George Kadianakis	7fbfdf2af7	Merge branch 'tor-github/pr/611'	2019-02-26 12:33:23 +02:00
teor	cc23afddd1	Changes file for backporting 29530 to 0.3.5	2019-02-26 09:58:52 +10:00
Kris Katterjohn	1b9e77349f	Fix some error-checking logic and a misleading error message When IPv4Only (IPv6Only) was used but the address could not be interpreted as a IPv4 (IPv6) address, the error message referred to the wrong IP version. This also fixes up the error-checking logic so it's more precise about what's being checked. Fixes bug 13221; bugfix on 0.2.3.9-alpha Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-02-25 16:03:42 -06:00
Nick Mathewson	626e6d2c39	Merge remote-tracking branch 'tor-github/pr/684'	2019-02-25 13:33:39 -05:00
rl1987	d731ab4583	Check that all valid values of int and unsigned int can be put into void pointer	2019-02-25 20:04:02 +02:00
Nick Mathewson	69238ca2da	Merge remote-tracking branch 'tor-github/pr/646'	2019-02-24 17:17:16 -05:00
Nick Mathewson	34601105a3	Merge branch 'ticket29065_squashed'	2019-02-24 17:02:35 -05:00
rl1987	b7dced893a	Fix shellcheck SC2006 warnings in test_switch_id.sh	2019-02-24 17:02:06 -05:00
Neel Chauhan	df8ad64735	When a DirAuth checks reachability on itself and has IPv6, mark it as reachable	2019-02-22 13:36:02 -05:00
George Kadianakis	f229a33685	Merge remote-tracking branch 'nickm/thread_rng'	2019-02-22 16:07:57 +02:00
Nick Mathewson	b3b737b875	Update pre-commit.git-hook for ticket 29553 - handle older source layout - handle empty changes directories - "set -e" so that we exit if there's a problem.	2019-02-21 13:35:33 -05:00
Nick Mathewson	658770a0f0	Remove changes entries for fixes that appeared in 0.4.0.2-alpha	2019-02-21 10:33:16 -05:00
Nick Mathewson	00a93b19cf	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-02-21 10:08:14 -05:00
Nick Mathewson	4a8a1f76ea	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-02-21 10:08:14 -05:00
Nick Mathewson	5062647918	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-02-21 10:08:14 -05:00
Nick Mathewson	54e42fe364	Merge branch 'maint-0.4.0'	2019-02-21 10:08:14 -05:00
David Goulet	be84ed1a64	kist: Don't write above the highwater outbuf mark KIST works by computing how much should be allowed to write to the kernel for a given socket, and then it writes that amount to the outbuf. The problem is that it could be possible that the outbuf already has lots of data in it from a previous scheduling round (because the kernel is full/busy and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf has been filling (is above its "highwater") and writes more anyway. The end result is that the outbuf length would exceed INT_MAX, hence causing an assertion error and a corresponding "Bug()" message to get printed to the logs. This commit makes it for KIST to take into account the outbuf length when computing the available space. Bug found and patch by Rob Jansen. Closes #29168. TROVE-2019-001. Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-02-21 10:07:34 -05:00
Nick Mathewson	b3416476b4	Remove all uses of weak_rng. I'm not removing the weak_rng code itself yet, since it is possible that we will want to revert one of these.	2019-02-20 12:24:34 -05:00
David Goulet	59c3910bec	Merge branch 'tor-github/pr/695'	2019-02-20 12:15:26 -05:00
David Goulet	d259194c82	Merge branch 'tor-github/pr/658'	2019-02-20 12:09:52 -05:00
David Goulet	da179088ee	Merge branch 'tor-github/pr/687'	2019-02-20 12:09:02 -05:00
David Goulet	7037fe1163	Merge branch 'tor-github/pr/700'	2019-02-20 12:06:39 -05:00
rl1987	b7ad8bcaad	Use setrlimit instead of ulimit -c in backtrace tests	2019-02-20 12:06:26 -05:00
David Goulet	8f5a3c0460	Merge branch 'tor-github/pr/675'	2019-02-20 11:45:58 -05:00
David Goulet	a30f17f72f	Merge branch 'tor-github/pr/696'	2019-02-20 11:29:55 -05:00
Roger Dingledine	4d4eda89a1	Merge branch 'maint-0.4.0'	2019-02-20 10:36:54 -05:00
Roger Dingledine	249319ec5d	fix typos from #28614	2019-02-20 10:32:47 -05:00
Nick Mathewson	b25cd5cfe1	Implement code to manage a per-thread instance of crypto_fast_rng() The subsystems API makes this really simple, fortunately. Closes ticket 29536	2019-02-19 15:36:08 -05:00
Nick Mathewson	6927e9a60c	Merge remote-tracking branch 'tor-github/pr/665'	2019-02-19 11:56:48 -05:00
Nick Mathewson	0fc5fdc430	Merge remote-tracking branch 'tor-github/pr/659'	2019-02-19 11:55:53 -05:00
Nick Mathewson	97e1539f7f	Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0	2019-02-19 11:53:02 -05:00
Nick Mathewson	c3fca4e4b3	Merge branch 'maint-0.4.0'	2019-02-19 11:51:24 -05:00
Nick Mathewson	4df31adef7	Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0	2019-02-19 11:51:19 -05:00
Nick Mathewson	f70929347f	Merge branch 'maint-0.4.0'	2019-02-19 11:49:24 -05:00
Nick Mathewson	4bc55ed5ee	Merge branch 'bug29145_029' into maint-0.4.0	2019-02-19 11:49:20 -05:00
Kris Katterjohn	4417ac880a	Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-02-19 11:38:32 -05:00
Nick Mathewson	af36af1a9b	Merge remote-tracking branch 'tor-github/pr/683'	2019-02-19 11:32:33 -05:00
Nick Mathewson	1239e411a7	Merge remote-tracking branch 'tor-github/pr/694'	2019-02-19 11:31:22 -05:00
Nick Mathewson	0db0b4769c	Merge remote-tracking branch 'tor-github/pr/678'	2019-02-19 11:30:27 -05:00
Nick Mathewson	26873bc4ed	Merge branch 'bug28698_035' into maint-0.4.0	2019-02-19 11:27:18 -05:00
José M. Guisado	78220aae1e	Add circuit time check before logging about relaxing circuit time Signed-off-by: José M. Guisado <guigom@riseup.net>	2019-02-19 11:24:51 -05:00
Nick Mathewson	5c87add923	Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0	2019-02-19 11:21:51 -05:00
teor	a798bd40fb	stats: Stop reporting statistics when ExtraInfoStatistics is 0 When ExtraInfoStatistics is 0, stop including bandwidth usage statistics, GeoIPFile hashes, ServerTransportPlugin lines, and bridge statistics by country in extra-info documents. Fixes bug 29018; bugfix on 0.2.4.1-alpha (and earlier versions).	2019-02-19 19:01:44 +10:00
teor	361738c964	Merge branch 'bug29017-033' into bug29017-master-merge	2019-02-19 18:59:16 +10:00
rl1987	6fdd34acd6	Remove check-tor script	2019-02-15 19:18:24 +02:00
George Kadianakis	80abe4170d	Update all the histogram functions to use the new design.	2019-02-15 17:43:23 +02:00
Matt Traudt	b054a6c6b9	kist: When readding chans, check correct chan's sched_heap_idx Closes #29508 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-02-14 16:19:31 -05:00
George Kadianakis	00b073b1bc	Merge branch 'maint-0.3.5'	2019-02-14 18:01:07 +02:00
George Kadianakis	d83c299eba	Merge branch 'tor-github/pr/689' into maint-0.3.5	2019-02-14 18:00:05 +02:00
George Kadianakis	9bfe4ed6dd	Merge branch 'tor-github/pr/536' into maint-0.3.5	2019-02-14 17:39:34 +02:00
George Kadianakis	f5a6d4c6ea	Disable unstable circuit padding unittest. until #29298 is implemented.	2019-02-14 12:09:41 +02:00
Nick Mathewson	5f42bc0f48	Merge remote-tracking branch 'tor-github/pr/699'	2019-02-13 15:19:59 -05:00
Nick Mathewson	5687165cf1	Merge remote-tracking branch 'tor-github/pr/674'	2019-02-13 11:38:35 -05:00
David Goulet	d5de1a0a55	Merge branch 'tor-github/pr/651'	2019-02-13 11:02:02 -05:00
David Goulet	6efc2a0e1f	Merge branch 'tor-github/pr/650' into maint-0.3.5	2019-02-13 10:56:24 -05:00
juga0	b61c3c6dfa	changes: Add changes file for #26698	2019-02-13 12:26:00 +00:00
David Goulet	c320c52e89	Merge branch 'tor-github/pr/690'	2019-02-12 13:04:25 -05:00
David Goulet	95e5f8fe03	Merge branch 'tor-github/pr/671'	2019-02-12 13:02:30 -05:00
Nick Mathewson	72b978c3a5	On windows, if we fail to load a consensus and it has a CRLF, retry. Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping the consensus.	2019-02-12 12:57:33 -05:00
Nick Mathewson	a797a69679	Merge branch 'maint-0.3.5'	2019-02-12 09:56:50 -05:00
Nick Mathewson	db209d4dba	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-02-12 09:56:49 -05:00
Nick Mathewson	7ead2af622	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-02-12 09:56:49 -05:00
Nick Mathewson	2e770216c4	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-02-12 09:56:49 -05:00
Karsten Loesing	a3f9ddcf03	Update geoip and geoip6 to the February 5 2019 database.	2019-02-12 14:40:42 +01:00
rl1987	8d04dc416b	Add changes file	2019-02-09 16:56:54 +02:00
Nick Mathewson	f4c76661d1	Add a script to check for coverage nondeterminism Closes ticket 29436.	2019-02-08 11:22:24 -05:00
Nick Mathewson	f2b646a2b6	Merge branch 'ticket29435_035' into ticket29435_040	2019-02-08 10:47:04 -05:00
Nick Mathewson	192b312c97	Fix coverage script. It was looking for object files made with the old automake directorations, but those changed when we split up our libraries. Fixes bug 29435; bugfix on 0.3.5.1-alpha.	2019-02-08 10:43:38 -05:00
rl1987	b53fee4622	Fix SC2086 warning in test_workqueue_*.sh shell scripts	2019-02-08 16:51:49 +02:00
Nick Mathewson	b63404ebba	Changes file for ticket29026.	2019-02-08 08:52:46 -05:00
Nick Mathewson	7f59b9fb1f	Merge branch 'maint-0.3.5'	2019-02-08 08:37:46 -05:00
Nick Mathewson	ab65347819	Merge branch 'ticket29040_1_changes' into maint-0.3.5	2019-02-08 08:37:43 -05:00
Nick Mathewson	eca0f87801	Add changes file for bug 29040.	2019-02-08 08:37:23 -05:00
Nick Mathewson	b1ae2fd65b	Merge branch 'maint-0.3.5'	2019-02-08 08:19:34 -05:00
Nick Mathewson	4b36f9676d	Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5	2019-02-08 08:19:31 -05:00
rl1987	8df6a65e6b	Fix shellcheck warning in zero_length_keys.sh	2019-02-07 17:23:23 +02:00
rl1987	daff9e1ba1	Fix shellcheck warning in fuzz_static_testcases.sh	2019-02-06 11:01:22 +02:00
rl1987	4e3880607a	Add changes file	2019-02-06 10:53:12 +02:00
Roger Dingledine	bfd1d70243	Merge branch 'maint-0.3.5'	2019-02-05 08:10:43 -05:00
Roger Dingledine	bca25eebfb	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-02-05 08:10:14 -05:00
Roger Dingledine	8ea98c0f4c	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-02-05 08:09:47 -05:00
Peter Gerber	83b1ca9b07	Add release note for bug 29150	2019-02-02 23:10:16 +00:00
rl1987	583e20615c	Add changes file	2019-02-02 16:54:50 +02:00
rl1987	0b245e418e	Add changes file	2019-02-01 21:43:45 +02:00
rl1987	10455aeff2	Fix shellcheck warnings in test_rust.sh	2019-02-01 20:53:40 +02:00
Nick Mathewson	4d7a0a1310	Update Cargo.lock with new comment; suppress 29244.	2019-02-01 16:38:23 +01:00
José M. Guisado	cb1072790f	Warn about missing ContactInfo when MyFamily set Operators should be warned when setting MyFamily in addition to missing ContactInfo Signed-off-by: José M. Guisado <guigom@riseup.net>	2019-01-31 13:27:42 +01:00
teor	6170d3fcf1	hs: Onion services put IPv6 addresses in service descriptors Rewrite service_intro_point_new() to take a node_t. Since node_get_link_specifier_smartlist() supports IPv6 link specifiers, this refactor adds IPv6 addresses to onion service descriptors. Part of 23576, implements 26992.	2019-01-31 07:53:22 +01:00
rl1987	58cbe51708	Use RFC5737-compliant example IP addresses in manpage when describing MapAddress	2019-01-30 17:13:40 +02:00
Nick Mathewson	bbd893d6bd	Write consensus files in binary mode This will help us out on windows now that we mmap files. Fixes part of ticket 28614.	2019-01-29 16:18:41 +01:00
rl1987	790150e57a	Allow empty username/password in SOCKS5 username/password auth message	2019-01-26 11:06:33 +02:00
Nick Mathewson	e19222a0da	Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings Fixes bug 29169.	2019-01-24 13:20:21 -05:00
Nick Mathewson	8b254c1c70	Merge branch 'precommit_squashed'	2019-01-24 11:08:10 -05:00
Neel Chauhan	c985940de9	Add version 3 onion service support to HSFETCH	2019-01-24 10:22:41 -05:00
rl1987	99fffc6c2f	Add a pre-commit hook that runs code and changelog entry formatting checks	2019-01-24 08:03:17 -05:00
Nick Mathewson	d23704bf26	Merge branch 'ticket28668_035' into ticket28668_040	2019-01-23 14:50:22 -05:00
Nick Mathewson	6144cf99ad	Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161.	2019-01-23 12:37:12 -05:00
Nick Mathewson	54c9c8b04f	If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede.	2019-01-23 12:04:57 -05:00
Nick Mathewson	adeeb8841e	Merge branch 'maint-0.3.5'	2019-01-23 11:18:14 -05:00
rl1987	712a622fce	Log an HSDesc we failed to parse at Debug loglevel	2019-01-23 10:37:10 -05:00
Nick Mathewson	dd6c2b0ad7	maint-0.2.9: remove changes files that are merged in 0.2.9 releases Many of these files cause check-changes to fail, which will be a long-term problem as we continue to support 0.2.9.	2019-01-23 09:48:28 -05:00
Nick Mathewson	8e1e71cc0d	Merge branch 'bug29122'	2019-01-22 14:31:01 -05:00
George Kadianakis	6243133a71	Fix intermittent failures of test_circuitpadding_wronghop(). We fix it by disabling the scheduling of actual padding. Fixes #29122.	2019-01-22 14:30:43 -05:00
Nick Mathewson	74e41155ff	Merge branch 'maint-0.3.5'	2019-01-22 12:27:50 -05:00
Nick Mathewson	d9fde87607	correct bug number in 29042 changelog	2019-01-22 12:27:46 -05:00
Nick Mathewson	21dd3ece62	Merge branch 'maint-0.3.5'	2019-01-22 11:55:56 -05:00
Nick Mathewson	4159d103d6	Merge branch 'bug29042_035' into maint-0.3.5	2019-01-22 11:55:53 -05:00
rl1987	00fff96e48	Fix shellcheck warning in test_rebind.sh	2019-01-22 15:14:16 +02:00
Nick Mathewson	00bc18b847	Merge remote-tracking branch 'tor-github/pr/653'	2019-01-22 08:13:14 -05:00
Nick Mathewson	0ce4d23af5	Merge branch 'maint-0.3.5'	2019-01-22 08:04:55 -05:00
Nick Mathewson	9ce1978b5e	Merge branch 'bug28979_035' into maint-0.3.5	2019-01-22 08:04:52 -05:00
rl1987	2529b29a75	Fix shellcheck warning SC2145 in torify script	2019-01-19 17:39:48 +02:00
Nick Mathewson	d1af4d65df	Merge branch 'maint-0.3.5'	2019-01-18 12:25:08 -05:00
Nick Mathewson	761f1bf71e	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-01-18 12:25:08 -05:00
Nick Mathewson	4cca7fb99b	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-01-18 12:25:08 -05:00
Nick Mathewson	a8580a6836	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-01-18 12:25:08 -05:00
rl1987	88818eacbd	Cleanup shellcheck warnings in autogen.sh	2019-01-18 13:49:30 +02:00
Nick Mathewson	d3b122485e	Add a changes file for 28837 (OpenSSL sha3)	2019-01-17 12:43:20 -05:00
Nick Mathewson	7c6a8c674b	Fix documentation for ClientAuth on HSv3. The manpage erroneously said "privkey" when "public-key" would have been correct. Reported by "Felixix" as ticket 28979. Bugfix on 0.3.5.1-alpha.	2019-01-16 16:10:20 -05:00
Nick Mathewson	3baf99e81b	Merge branch 'ticket28668_035' into ticket28668_040	2019-01-16 15:54:31 -05:00
Nick Mathewson	f684cd8005	Fail any unit test that causes an unhandled LD_BUG or LOG_ERR Closes ticket 28668.	2019-01-16 15:47:33 -05:00
Nick Mathewson	16430fdaf5	Merge branch 'maint-0.3.5'	2019-01-16 14:43:53 -05:00
Kris Katterjohn	f0408b844f	Add changes file for bug 28981 The fix was in commit 61636ad989de674698601284957dacde53cc4984. Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-01-16 14:40:31 -05:00
Nick Mathewson	0981ac4c59	Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha.	2019-01-16 14:35:30 -05:00
Nick Mathewson	49062d72b5	Start on 0.4.0.1-alpha changelog	2019-01-16 08:28:07 -05:00
Nick Mathewson	139202174b	Remove changes entries that appeared in 0.3.5.7	2019-01-16 08:20:12 -05:00
Nick Mathewson	2dd23086f1	Remove fallback scripts and whitelist They have been extracted to a new fallback-scripts.git repository. Closes ticket 27914.	2019-01-15 19:20:25 -05:00
Mike Perry	6440fdb8de	Changes file for Ticket 28142.	2019-01-15 22:53:03 +00:00
Nick Mathewson	9a61d3f5ad	Merge branch 'bug24953_squashed'	2019-01-15 08:25:35 -05:00
rl1987	7fbe7a2563	In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'	2019-01-15 08:25:29 -05:00
Nick Mathewson	c281e587bb	Merge branch 'ticket28058_squashed'	2019-01-15 08:08:41 -05:00
rl1987	30a925fe96	Add changes file	2019-01-15 08:08:29 -05:00
Nick Mathewson	691dec5d46	Merge branch 'maint-0.3.5'	2019-01-14 14:02:42 -05:00
rl1987	9d9e71824c	Rework rep_hist_log_link_protocol_counts()	2019-01-14 14:01:55 -05:00
Nick Mathewson	cef910642e	Merge branch 'bug28989_squashed'	2019-01-11 18:56:57 -05:00
rl1987	1bcececdd8	Fix CID 1442277	2019-01-11 18:56:48 -05:00
Nick Mathewson	d21fa48cac	Merge branch 'maint-0.3.5'	2019-01-11 18:53:24 -05:00
Nick Mathewson	efd765a948	Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5	2019-01-11 18:53:18 -05:00
teor	89a0b77740	rend: stop warning when clients send multiple rend establish cells Stop logging "Tried to establish rendezvous on non-OR circuit..." as a warning. Instead, log it as a protocol warning, because there is nothing that relay operators can do to fix it. Fixes bug 29029; bugfix on 0.2.5.7-rc.	2019-01-10 07:59:59 +10:00
Nick Mathewson	2f0e187191	Merge remote-tracking branch 'tor-github/pr/627'	2019-01-09 15:46:14 -05:00
Nick Mathewson	578a93bbbc	Merge branch 'ticket28843'	2019-01-09 09:49:25 -05:00
Nick Mathewson	0ed966fde1	Merge branch 'maint-0.3.5'	2019-01-09 09:38:27 -05:00
Nick Mathewson	694e3c57fd	Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5	2019-01-09 09:38:22 -05:00
Nick Mathewson	d890ec29aa	Merge branch 'maint-0.3.5'	2019-01-09 09:35:40 -05:00
rl1987	380ae2b74b	Stop logging 'Your Guard' in circpathbias.c	2019-01-09 09:35:36 -05:00
Nick Mathewson	3df1d29d9b	Merge branch 'bug28591_035_squashed'	2019-01-09 09:33:31 -05:00
teor	44db455cc8	Dir: allow directory mirrors to serve future consensuses When Tor's clock is behind the clocks on the authorities, allow Tor to serve future consensuses. Fixes bug 28654; bugfix on 0.3.0.1-alpha.	2019-01-09 09:32:28 -05:00
Nick Mathewson	e6a4401200	Merge branch 'maint-0.3.5'	2019-01-09 08:52:10 -05:00
Kris Katterjohn	09472791d0	Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-01-09 08:52:05 -05:00
Nick Mathewson	a891d81c5f	Changes file for 28856	2019-01-09 08:48:11 -05:00
teor	85c598cbc2	stats: Make PaddingStatistics depend on ExtraInfoStatistics When ExtraInfoStatistics is 0, stop including PaddingStatistics in relay and bridge extra-info documents. Fixes bug 29017; bugfix on 0.3.1.1-alpha.	2019-01-08 18:21:10 +10:00
Kris Katterjohn	c59b572e93	Fix tor_ersatz_socketpair on IPv6-only systems In get_local_listener used by tor_ersatz_socketpair, the address family used when binding the IPv6 socket was AF_INET instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>	2019-01-07 17:28:21 -06:00
Nick Mathewson	0402746a99	Merge remote-tracking branch 'rl1987/doc28805'	2019-01-07 08:51:37 -05:00
Nick Mathewson	85c5f58509	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-01-07 08:43:46 -05:00
Nick Mathewson	fe26e1f1c8	Merge branch 'maint-0.3.5'	2019-01-07 08:43:46 -05:00
Nick Mathewson	3d18903f53	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-01-07 08:43:45 -05:00
Nick Mathewson	ba71b17865	Merge branch 'maint-0.2.9' into maint-0.3.3	2019-01-07 08:43:45 -05:00
Karsten Loesing	445d6750f7	Update geoip and geoip6 to the January 3 2019 database.	2019-01-07 09:00:29 +01:00
Nick Mathewson	73de7b4bcb	Merge branch 'bug21394_029_redux' into maint-0.2.9	2019-01-04 15:04:54 -05:00
Nick Mathewson	af85a0f28f	Remove from master those changes files that will appear in 0.3.5.7 or earlier.	2019-01-04 15:04:00 -05:00
Nick Mathewson	fe3331b845	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-01-04 14:57:06 -05:00
Nick Mathewson	bf8bb9c526	Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3	2019-01-04 14:49:16 -05:00
Nick Mathewson	d47c9276de	Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4	2019-01-04 14:34:38 -05:00
Nick Mathewson	98a1b8770c	Merge branch 'maint-0.3.5'	2019-01-03 21:34:43 -05:00
Nick Mathewson	c75cf802d3	Merge branch 'ticket28879' into maint-0.3.5	2019-01-03 21:34:35 -05:00
Nick Mathewson	a7cbbf279e	Merge branch 'ticket28852'	2019-01-03 21:31:08 -05:00
Nick Mathewson	9ba690e33f	Merge branch 'maint-0.3.5'	2019-01-03 09:45:56 -05:00
Nick Mathewson	abdc6aede2	Merge branch 'ticket28851_035_squashed' into maint-0.3.5	2019-01-03 09:45:53 -05:00
Nick Mathewson	b82717b273	Stop re-checking our hardcoded dh parameters on every startup Closes ticket 28851.	2019-01-03 09:45:43 -05:00
Nick Mathewson	47176eb678	Merge branch 'maint-0.3.5'	2019-01-03 09:44:15 -05:00
Nick Mathewson	98736cf36a	Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5	2019-01-03 09:44:10 -05:00
Nick Mathewson	27853938a1	Merge branch 'maint-0.3.5'	2019-01-03 09:02:40 -05:00
Nick Mathewson	3e64553f76	Merge branch 'maint-0.3.3' into maint-0.3.4	2019-01-03 09:02:39 -05:00
Nick Mathewson	ed62f0fa15	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-01-03 09:02:39 -05:00
Nick Mathewson	bf413829cb	Detect openssl bug 7712 and work around it. In theory it would be better to detect this bug in advance, but this approach is much simpler, and therefore safer to backport. This closes tor issue 28973.	2019-01-03 09:00:47 -05:00
rl1987	dbf1725a13	Completely remove 'GETINFO status/version/num-{concurring,versioning}'	2019-01-03 10:36:38 +02:00
Nick Mathewson	3e7f13a4ef	Merge branch 'maint-0.3.5'	2019-01-02 16:15:39 -05:00
Nick Mathewson	98755cbddf	Merge branch 'bug28974_035' into maint-0.3.5	2019-01-02 16:15:34 -05:00
Nick Mathewson	eaaeaf7933	Merge branch 'maint-0.3.5'	2019-01-02 16:09:20 -05:00
Nick Mathewson	a4b86421d2	ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add	2019-01-02 16:09:10 -05:00
Nick Mathewson	b33bcb1e63	Add an errno.h include to freespace.c to fix bug 28974.	2019-01-02 15:19:52 -05:00
rl1987	8eadfad71d	Tweak ControlPort description in manpage	2018-12-23 19:58:25 +02:00
Nick Mathewson	99713b176b	Merge branch 'maint-0.3.5'	2018-12-21 15:42:58 -05:00
Nick Mathewson	a9eec33649	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-12-21 15:42:57 -05:00
Nick Mathewson	70dd6d07bb	Merge branch 'orconn-tracker_squashed'	2018-12-21 14:22:11 -05:00
Taylor Yu	2100b35f07	changes file for ticket27167	2018-12-21 14:15:35 -05:00
Nick Mathewson	ab4395d082	Merge branch 'ticket28847'	2018-12-21 13:26:47 -05:00
Alexander Færøy	cf4b3dbd44	Use the subsystem list to initialize and shutdown process module. This patch makes the process module use the subsystem list for initializing and shutting down. See: https://bugs.torproject.org/28847	2018-12-21 13:26:38 -05:00
David Goulet	2420e84ba4	mainloop: Reactivate the linked connection event with a non empty list Linked connections aren't woken up by libevent due to I/O but rather artificially so we can, by chunks, empty the spooled object(s). Commit `5719dfb48f` (in 0.3.4.1-alpha) made it that the schedule_active_linked_connections_event would be only called once at startup but this is wrong because then we would never go through again the active linked connections. Fortunately, everytime a new linked connection is created, the event is activated and thus we would go through the active list again. On a busy relay, this issue is mitigated by that but on a slower relays or bridge, a connection could get stuck for a while until a new directory information request would show up. Fixes #28717, #28912	2018-12-21 11:25:23 -05:00
Nick Mathewson	e4109020e9	Merge remote-tracking branch 'tor-github/pr/609'	2018-12-20 16:42:35 -05:00
Nick Mathewson	0e6e902cbc	Merge branch 'document_--version'	2018-12-20 11:50:48 -05:00
Nick Mathewson	a517daa56f	base32_decode(): Return number of bytes written on success. This makes it consistent with base64_decode(). Closes ticket 28913.	2018-12-20 08:36:25 -05:00
Nick Mathewson	973a5db808	Merge remote-tracking branch 'tor-github/pr/445'	2018-12-20 07:53:57 -05:00
Nick Mathewson	9c6283732a	Merge branch 'maint-0.3.5'	2018-12-20 07:50:04 -05:00
Nick Mathewson	ef97543270	Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5	2018-12-20 07:49:59 -05:00
Alexander Færøy	e2c36b9ca0	Add and update changes files for #28846 . This ticket finishes the implementatoin of #28180 and adds the new STATUS message from #28846. See: https://bugs.torproject.org/28846	2018-12-20 04:08:04 +01:00
teor	02009c66c0	Stop running stem's unit tests as part of "make test-stem" But continue to run stem's unit and online tests during "make test-stem-full". Fixes bug 28568; bugfix on 0.2.6.3-alpha.	2018-12-20 13:01:18 +10:00
Nick Mathewson	1c47459e5a	Merge branch 'maint-0.3.5'	2018-12-19 15:36:08 -05:00
Nick Mathewson	b7018b1a24	Merge branch 'ticket28883_035' into maint-0.3.5	2018-12-19 15:36:03 -05:00
Nick Mathewson	ed0bc85ed0	Merge branch 'ticket28853'	2018-12-18 18:59:56 -05:00
Nick Mathewson	bb091da1e7	Merge branch 'ticket28839_v2_squashed'	2018-12-18 18:59:05 -05:00
Nick Mathewson	976c62e62a	Changes file for ticket28839	2018-12-18 18:58:08 -05:00
Nick Mathewson	372df7a630	Merge branch 'maint-0.3.5'	2018-12-18 13:56:22 -05:00
Nick Mathewson	26bbeb298d	Merge branch 'bug28612_squashed' into maint-0.3.5	2018-12-18 13:55:57 -05:00
Nick Mathewson	1c2abea30a	Call run_tor_main_loop() in ntmain.c, rather than do_main_loop(). Fixes bug 28612; bugfix on 0.3.5.3-alpha.	2018-12-18 13:55:08 -05:00
Nick Mathewson	0af0f78dff	Merge branch 'maint-0.3.5'	2018-12-18 13:52:39 -05:00
Nick Mathewson	702fd6f0f2	Merge branch 'ticket28881_035' into maint-0.3.5	2018-12-18 13:52:36 -05:00
Nick Mathewson	4894d44ab8	Always initialize addr in parse_port_config() It was always analyzed before use, but scan-build wasn't able to persuade itself of that. Closes ticket 28881.	2018-12-18 13:52:25 -05:00
Nick Mathewson	a3e6f2467b	Merge remote-tracking branch 'tor-github/pr/595'	2018-12-18 13:51:21 -05:00
Nick Mathewson	872998dd00	Merge branch 'ticket28179_squashed_merged'	2018-12-18 13:36:34 -05:00
Alexander Færøy	44a80bb361	Add missing changes files for #26360 , #28179 , #28180 . See: https://bugs.torproject.org/26179 See: https://bugs.torproject.org/28180 See: https://bugs.torproject.org/28360	2018-12-18 13:36:08 -05:00
Nick Mathewson	90187b1bfc	Remove changes that are already merged in 0.3.5.x releases	2018-12-18 08:15:38 -05:00
Nick Mathewson	c61cd5775c	Revert "Log bootstrap tag names" This reverts commit `1b855af5e3`.	2018-12-18 08:09:43 -05:00
Nick Mathewson	508837b62b	Document the output of --version Closes 28889	2018-12-17 17:54:01 -05:00
Nick Mathewson	5a22b42c3a	Merge branch 'maint-0.3.5'	2018-12-17 10:57:51 -05:00
Nick Mathewson	1a9a9fc0ff	Changes file for 28562	2018-12-17 10:57:47 -05:00
Nick Mathewson	315c21d2e2	test_rebind: wait for tor to timeout, even if it is logging a lot Fixes bug 28883; bugfix on 0.3.5.4-alpha.	2018-12-17 09:53:17 -05:00
Nick Mathewson	16199a54a2	Check hostname before using it in send_resolved_hostname_cell() Also, turn an absent hostname into a BUG(), not a crash. Found by scan-build. Closes ticket 28879; bugfix on 0.1.2.7-alpha	2018-12-17 09:15:37 -05:00
Nick Mathewson	3dd1f064a7	Rewrite the core of parse_short_policy() to be faster. The old implementation did some funky out-of-order lexing, and tended to parse every port twice if the %d-%d pattern didn't match. Closes ticket 28853.	2018-12-14 16:07:10 -05:00
Nick Mathewson	9dc53bc68f	Remove a needless memset() in get_token_arguments() I believe we originally added this for "just in case" safety, but it isn't actually needed -- we never copy uninitialized stack here. What's more, this one memset is showing up on our startup profiles, so we ought to remove it. Closes ticket 28852.	2018-12-14 14:48:12 -05:00
Matt Traudt	06046c726f	Add changes file for <30min HeartbeatPeriod patch	2018-12-14 09:24:19 -05:00
Nick Mathewson	4bc3983f64	Add a DROPOWNERSHIP controller command to undo TAKEOWNERSHIP. Closes ticket 28843.	2018-12-13 19:35:02 -05:00
Nick Mathewson	f8dac5c900	Merge branch 'maint-0.3.5'	2018-12-13 19:01:29 -05:00
Nick Mathewson	94a7998158	Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5	2018-12-13 18:57:00 -05:00
Nick Mathewson	041e9235c1	Lower the loop_max constant in curve25519_basepoint_spot_check() The point of this function is to make sure that the ed25519-based implementation of curve25519_basepoint() actually works when we start tor, and use the regular fallback implementation if it doesn't. But it accounts for 9% of our startup time in the case when we have directory information, and I think it's safe to make the test shorter. After all, it has yet to find any actual bugs in curved25519_scalarmult_basepoint_donna() on any platforms. Closes ticket 28838.	2018-12-13 11:26:09 -05:00
Nick Mathewson	69264f96f3	Merge branch 'dormant_persist_squashed'	2018-12-13 08:26:10 -05:00
Nick Mathewson	c037bf5817	changes file for ticket26864	2018-12-13 08:25:54 -05:00
Nick Mathewson	91be6a77e9	Merge remote-tracking branch 'teor/ticket24838'	2018-12-11 10:04:16 -05:00
Nick Mathewson	93019b4787	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-12-11 10:00:22 -05:00
Nick Mathewson	633813e313	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-12-11 10:00:22 -05:00
Nick Mathewson	b2625b09f1	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-12-11 10:00:22 -05:00
Nick Mathewson	1983426073	Merge branch 'maint-0.3.5'	2018-12-11 10:00:22 -05:00
Nick Mathewson	3b5188576f	Note ticket number in changes file for 24803	2018-12-11 10:00:19 -05:00
Nick Mathewson	b915b6cd21	Merge remote-tracking branch 'github/prop297'	2018-12-11 09:44:57 -05:00
Nick Mathewson	6506b1ee9f	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-12-11 09:41:05 -05:00
Nick Mathewson	e1273d7d1b	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-12-11 09:41:05 -05:00
Nick Mathewson	27e4269929	Merge branch 'maint-0.3.5'	2018-12-11 09:41:05 -05:00
Nick Mathewson	c1f9191581	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-12-11 09:41:04 -05:00
Nick Mathewson	58d2ced572	Merge remote-tracking branch 'teor/24805-phoul'	2018-12-11 09:38:27 -05:00
Nick Mathewson	ce501a529f	Merge remote-tracking branch 'catalyst-github/ticket27402'	2018-12-11 09:37:41 -05:00
Nick Mathewson	b65166750d	Merge remote-tracking branch 'rl1987/ticket28007_take2'	2018-12-11 09:25:46 -05:00
Nick Mathewson	c4c372f281	Merge remote-tracking branch 'rl1987/ticket28551'	2018-12-11 09:24:35 -05:00
Taylor Yu	1b855af5e3	Log bootstrap tag names Add the bootstrap tag name to the log messages, so people troubleshooting connection problems can look up a symbol instead of a number. Closes ticket 28731.	2018-12-10 17:22:28 -06:00
teor	4991b29311	Fallbacks: Update the hard-coded fallback list in December 2018 Merge Phoul's two lists into teor's list. Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 157 fallbacks (92 new, 65 existing, 85 removed) generated in December 2018. Closes ticket 24803.	2018-12-10 17:02:19 +10:00
teor	d9b9c1fa76	Changes file for 24805	2018-12-07 17:04:50 +10:00
teor	78e177d622	Fallbacks: Update the hard-coded fallback list in December 2018 Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 148 fallbacks (89 new, 59 existing, 91 removed) generated in December 2018. Closes ticket 24803.	2018-12-07 16:43:10 +10:00
teor	6bc5c06dc2	Fallbacks: accept relays that are a fuzzy match to the whitelist If a relay matches at least one fingerprint, IPv4 address, or IPv6 address in the fallback whitelist, it can become a fallback. This reduces the work required to keep the list up to date. Closes ticket 28768.	2018-12-07 16:30:24 +10:00
teor	c3fe405e21	Fallbacks: use a 24 hour future consensus tolerance Tor clients on 0.3.5.6-rc? and later will use a consensus that will become valid up to 24 hours in the future. Clients on 0.3.5.5-alpha? and earlier won't accept future consensuses. Update the fallback expiry tolerance to match tor's checks. Part of 28768, follow-up on 28591.	2018-12-07 15:54:32 +10:00
teor	766fd6cf76	Fallbacks: use a 24 hour consensus expiry tolerance Tor clients will use a consensus that expired up to 24 hours ago. Clients on 0.3.5.5-alpha? and earlier won't select guards from an expired consensus, but they can still bootstrap if they have existing guards. Update the fallback expiry tolerance to match tor's checks. Part of 28768, follow-up on 24661.	2018-12-07 15:54:32 +10:00
Nick Mathewson	2ccb9e9444	Merge branch 'maint-0.3.5'	2018-12-06 09:26:34 -05:00
Nick Mathewson	c1f86f7492	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-12-06 09:26:33 -05:00
Nick Mathewson	c4f7953d8b	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-12-06 09:26:32 -05:00
Nick Mathewson	00341d97f3	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-12-06 09:26:32 -05:00
rl1987	ecaecaddd8	Add changes file	2018-12-06 15:31:33 +02:00
Karsten Loesing	57798eb1cb	Update geoip and geoip6 to the December 5 2018 database.	2018-12-05 21:02:39 +01:00
Nick Mathewson	46a321fbdd	Merge branch 'maint-0.3.5'	2018-12-05 10:25:12 -05:00
Nick Mathewson	967efc0d28	Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5	2018-12-05 10:23:28 -05:00
Nick Mathewson	1eb3719a62	Merge remote-tracking branch 'public/prop298'	2018-12-05 09:43:03 -05:00
Nick Mathewson	1f95e80351	Merge branch 'prop293_squashed'	2018-12-05 09:24:51 -05:00
Nick Mathewson	d4f558e385	Merge remote-tracking branch 'tor-github/pr/531'	2018-12-05 09:02:49 -05:00
Nick Mathewson	4002a84ffe	Merge remote-tracking branch 'tor-github/pr/561'	2018-12-05 08:29:41 -05:00
Nick Mathewson	ca4b86f90a	Merge remote-tracking branch 'tor-github/pr/508'	2018-12-05 08:19:02 -05:00
David Goulet	cec616a0c8	hs-v3: Don't BUG() if descriptor is found on SOCKS connection retry When retrying all SOCKS connection because new directory information just arrived, do not BUG() if a connection in state AP_CONN_STATE_RENDDESC_WAIT is found to have a usable descriptor. There is a rare case when this can happen as detailed in #28669 so the right thing to do is put that connection back in circuit wait state so the descriptor can be retried. Fixes #28669 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-12-04 14:34:04 -05:00
David Goulet	8506dcdeb7	Merge branch 'maint-0.3.5'	2018-12-04 12:55:02 -05:00
David Goulet	0906dde9d5	man: Document HSv3 client authorization revocation Removing a ".auth" file revokes a client access to the service but the rendezvous circuit is not closed service side because the service simply doesn't know which circuit is for which client. This commit notes in the man page that to fully revoke a client access to the service, the tor process should be restarted. Closes #28275 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-12-04 18:49:19 +02:00
rl1987	894d207f84	manpage: Mention that adding new HS is unsupported if Sandbox is enabled	2018-12-03 15:23:01 +02:00
Nick Mathewson	8accf71c44	Merge remote-tracking branch 'tor-github/pr/556'	2018-12-01 20:35:38 -05:00
Nick Mathewson	2b2b97484a	Merge branch 'ticket27490a_squashed'	2018-12-01 20:32:18 -05:00
Neel Chauhan	822cb93cab	Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports	2018-12-01 14:55:57 -05:00
rl1987	009205dabe	Add changes file	2018-12-01 14:31:17 -05:00
Nick Mathewson	d4d4a4b2dd	Merge remote-tracking branch 'tor-github/pr/527'	2018-12-01 11:30:53 -05:00
Nick Mathewson	c63d951e7f	Merge remote-tracking branch 'tor-github/pr/530'	2018-12-01 11:28:22 -05:00
Nick Mathewson	51d94cea33	Merge branch 'maint-0.3.5'	2018-12-01 11:26:55 -05:00
Nick Mathewson	1a97379e5e	Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5	2018-12-01 11:26:52 -05:00
Nick Mathewson	7e9985b75a	Merge remote-tracking branch 'tor-github/pr/536'	2018-12-01 11:24:02 -05:00
Nick Mathewson	af9dc12fab	Merge branch 'maint-0.3.5'	2018-12-01 11:20:10 -05:00
rl1987	9bbf7ec303	Add changes file	2018-12-01 11:18:03 -05:00
Nick Mathewson	e3a19b1c78	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-12-01 11:15:09 -05:00
Nick Mathewson	cf3f7753c3	Merge branch 'maint-0.3.5'	2018-12-01 11:15:09 -05:00
Nick Mathewson	e82023d2f7	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-12-01 11:15:09 -05:00
Taylor Yu	7685f8ad35	Use table lookup for bootstrap_status_to_string It also no longer distinguishes the case of internal-only paths, which was often wrong anyway. Closes ticket 27402.	2018-11-30 16:54:01 -06:00
Neel Chauhan	d18a167ff3	sr: Switch from tor_assert() to BUG() Closes #19566 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-11-30 12:16:18 -05:00
teor	7a45bc74a4	Dir: when Tor's clock is behind, use a future consensus to bootstrap When Tor's clock is behind the clocks on the authorities, allow Tor to bootstrap successfully. Fixes bug 28591; bugfix on 0.2.0.9-alpha.	2018-11-29 00:50:24 +10:00
Nick Mathewson	9c2b114b2e	Merge branch 'maint-0.3.5'	2018-11-27 12:03:50 -05:00
Nick Mathewson	72c1303cef	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-27 12:03:50 -05:00
Alexander Færøy	36c3235534	Explicitly specify path to OpenSSL for Appveyor. This patch explicitly specifies the path to our OpenSSL dependency and disables the installation of an external OpenSSL version and instead uses the OpenSSL version available from the MinGW environments. See: https://bugs.torproject.org/28574	2018-11-27 14:53:50 +01:00
Nick Mathewson	8a15d0f69b	Merge branch 'maint-0.3.5'	2018-11-26 17:25:28 -05:00
Nick Mathewson	feb41b7c30	Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5	2018-11-26 17:24:41 -05:00
Nick Mathewson	fc1ad9ab65	Merge remote-tracking branch 'tor-github/pr/495'	2018-11-26 17:17:40 -05:00
Nick Mathewson	e12fdeb181	Changes file for "Dormant Mode" (28335, 2149).	2018-11-26 16:39:44 -05:00
David Goulet	2b9a907bdc	Merge branch 'maint-0.3.5'	2018-11-26 14:59:24 -05:00
David Goulet	056ffdec4c	Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5	2018-11-26 14:59:10 -05:00
David Goulet	d37dbb09c2	hs-v3: Do not close RP circuits when deleting an ephemeral service Bug reported on tor-dev@ and here is the detail explanation of the issue: https://lists.torproject.org/pipermail/tor-dev/2018-November/013558.html Fixes bug #28619 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-11-26 14:45:53 -05:00
rl1987	d6eafd06a9	Add changes file	2018-11-26 17:46:27 +02:00
Nick Mathewson	439ffcefd5	changes file for prop293 / ticket 26770	2018-11-25 10:19:08 -05:00
Nick Mathewson	7da06e43da	No longer exit for missing required protocolversions on an old consensus Specifically, if the consensus is older than the (estimted or measured) release date for this version of tor, we assume that the required versions may have changed in between that consensus and this release. Implements ticket 27735 and proposal 297.	2018-11-24 20:44:37 -05:00
Nick Mathewson	05dee063c8	Emit router families in canonical form This patch has routers use the same canonicalization logic as authorities when encoding their family lists. Additionally, they now warn if any router in their list is given by nickname, since that's error-prone. This patch also adds some long-overdue tests for family formatting.	2018-11-24 16:35:58 -05:00
Nick Mathewson	0a0c612b79	Add a consensus method in which md families get canonicalized. Implements prop298. Closes ticket 28266.	2018-11-24 12:01:09 -05:00
teor	657618ba9b	Entry Nodes: Mark outdated dirservers in reasonably live consensuses Fixes bug 28569; bugfix on Tor 0.3.2.5-alpha.	2018-11-22 16:54:34 +10:00
teor	d1ac5613fc	Entry Nodes: Use a reasonably live consensus to select guards Fixes bug 24661; bugfix on 0.3.0.1-alpha.	2018-11-22 16:54:22 +10:00
teor	ffc7b81b5d	Test: Fix memory leaks and missing unmocks in entry guard tests test_entry_guard_outdated_dirserver_exclusion leaks memory, and is missing some unmocks. Fixes 28554; bugfix on 0.3.0.1-alpha.	2018-11-22 16:42:32 +10:00
Nick Mathewson	a9820f072b	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-20 13:10:38 -05:00
Nick Mathewson	56f24889a2	Merge branch 'maint-0.3.5'	2018-11-20 13:10:38 -05:00
Nick Mathewson	9da8cd0bc3	Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4	2018-11-20 13:10:18 -05:00
rl1987	befcd6ab7f	Add changes file for #28012	2018-11-20 17:00:32 +02:00
Nick Mathewson	34cadefe34	Merge branch 'maint-0.3.5'	2018-11-20 09:04:35 -05:00
rl1987	ffee0a6384	Add pre-push git hook to prevent fixup and squash commits from ending up in master	2018-11-20 15:40:52 +02:00
Taylor Yu	0489288aa2	Update control_free_all() for #27169 Reset the added bootstrap tracking state introduced by ticket 27169. Fixes bug 28524; bugfix on 0.3.5.1-alpha.	2018-11-19 15:48:08 -06:00
Alexander Færøy	d020124138	Add changes file for #28518 . See: https://bugs.torproject.org/28518	2018-11-19 16:33:06 +01:00
Nick Mathewson	8183640ada	Merge branch 'maint-0.3.5'	2018-11-19 10:18:57 -05:00
Alexander Færøy	3260914db0	Add missing library to build tor-print-ed-signing-cert. To succesful compile tor-print-ed-signing-cert.exe on Windows we sometimes need to include the @TOR_LIB_GDI@ library. See: https://bugs.torproject.org/28485	2018-11-19 10:18:44 -05:00
Nick Mathewson	a8df39e955	Merge remote-tracking branch 'tor-github/pr/519'	2018-11-19 08:47:03 -05:00
Nick Mathewson	26539ec3ae	Merge remote-tracking branch 'tor-github/pr/518'	2018-11-19 08:45:41 -05:00
Nick Mathewson	48b08f0592	Merge branch 'ticket27359_v2_squashed'	2018-11-19 08:26:49 -05:00
Nick Mathewson	426c9561c5	Use nodefamily_t in microdescriptors. Closes ticket 27359.	2018-11-19 08:26:10 -05:00
rl1987	c8c4c3dffa	fixup! Make ROUTERLIST_PRUNING_INTERVAL 1 hr.	2018-11-17 10:27:10 +02:00
Nick Mathewson	35558c39dd	Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5	2018-11-16 08:57:56 -05:00
Nick Mathewson	80a6228aac	Merge branch 'bug25573-034-typefix' into maint-0.3.4	2018-11-15 16:58:16 -05:00
Nick Mathewson	15e752e6b1	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-15 16:54:56 -05:00
Nick Mathewson	cbe04d4550	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-11-15 16:54:16 -05:00
Nick Mathewson	63312e0299	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-15 16:47:25 -05:00
Nick Mathewson	aebe8a82c9	Merge branch 'bug26913_033' into maint-0.3.3	2018-11-15 16:47:22 -05:00
Nick Mathewson	8569166c70	Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9 Resolved conflicts with the 26269 fix in `015fcd0e11`.	2018-11-15 16:43:50 -05:00
Nick Mathewson	1e6ffeaeaa	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-15 16:37:41 -05:00
Nick Mathewson	34e4d5a783	Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3	2018-11-15 16:37:02 -05:00
David Goulet	f41bec1290	man: ClientOnionAuthDir can't be reloaded with Sandbox 1 By adding a file to the ClientOnionAuthDir and sending a HUP signal, tor would load the new file and use it. However, that doesn't work with the Sandbox since post initilization, nothing can be changed. Document in the manpage that limitation within the Sandbox description. Closes #28128 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-11-15 14:36:39 -05:00
rl1987	d9f7cb3f62	Fix shellcheck issues in cov-diff - SC2231, SC2006 and SC2086	2018-11-15 19:37:07 +02:00
rl1987	8cb817cc5e	Add changes file	2018-11-15 19:35:56 +02:00
Nick Mathewson	92f71b8e88	Merge branch 'maint-0.3.5'	2018-11-15 09:06:18 -05:00
Nick Mathewson	a9db07f325	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-15 09:06:18 -05:00
teor	b8ce1de4bf	Appveyor: always show the logs, and upload them as build artifacts Always show the configure and test logs, and upload them as build artifacts, when building for Windows using Appveyor CI. Implements 28459.	2018-11-15 21:04:17 +10:00
teor	83c1baca16	Appveyor: manually add zstd flags to configure The mingw zstd from MSYS2 doesn't come with a pkg-config file. Fixes 28454 on Tor 0.3.4.1-alpha.	2018-11-15 19:23:37 +10:00
teor	540c833f20	Appveyor: remove incorrect OpenSSL path Fixes 28399 on 0.3.4.1-alpha.	2018-11-15 19:23:33 +10:00
teor	44ced9b750	Merge branch 'bug28096-029-squashed' into bug28096-035-squashed Move the get_uname() changes from src/common/compat.c to src/lib/osinfo/uname.c	2018-11-15 12:23:29 +10:00
teor	2fbc58cf07	Windows: fix uname on recent Windows versions Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 and later from their NT versions. On recent Windows versions, the GetVersionEx() function may report an earlier Windows version than the running OS. To avoid user confusion, add "[or later]" to Tor's version string on affected versions of Windows. Remove Windows versions that were never supported by the GetVersionEx() function. Stop duplicating the latest Windows version in get_uname(). Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly.	2018-11-15 12:19:11 +10:00
Nick Mathewson	5090fecaca	changes file for no-circular-dependencies stuff (28362)	2018-11-14 16:07:36 -05:00
Nick Mathewson	12175987fc	Merge branch 'maint-0.3.5'	2018-11-14 15:43:49 -05:00
Nick Mathewson	d598d834f5	Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5	2018-11-14 15:43:46 -05:00
David Goulet	c99f220f78	conn: Close the read side of a closing connection when write limit is reached In conn_close_if_marked(), we can decide to keep a connection open that still has data to flush on the wire if it is being rate limited on the write side. However, in this process, we were also looking at the read() side which can still have token in its bucket and thus not stop the reading. This lead to a BUG() introduced in 0.3.4.1-alpha that was expecting the read side to be closed due to the rate limit but which only applies on the write side. This commit removes any bandwidth check on the read side and simply stop the read side on the connection regardless of the bucket state. If we keep the connection open to flush it out before close, we should not read anything. Fixes #27750 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-11-14 15:42:52 -05:00
Nick Mathewson	cec58ae55c	Merge branch 'maint-0.3.5'	2018-11-14 07:56:52 -05:00
Nick Mathewson	a58b19465d	Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5	2018-11-14 07:56:48 -05:00
Nick Mathewson	1043532a51	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-14 07:55:07 -05:00
Nick Mathewson	3deb01e1a4	Merge branch 'maint-0.3.5'	2018-11-14 07:55:07 -05:00
Nick Mathewson	eba989bf0e	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-14 07:55:07 -05:00
Nick Mathewson	26fd7c1d9c	Changes file for bug 28419	2018-11-14 07:51:36 -05:00
Nick Mathewson	c7f09554eb	Merge branch 'maint-0.3.5'	2018-11-14 07:45:58 -05:00
Taylor Yu	763ccd0928	Fix Doxyfile for 0.3.5 source tree moves Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug 28435; bugfix on 0.3.5.1-alpha.	2018-11-14 07:45:55 -05:00
teor	16ca6fdfdb	log: stop talking about the Named flag in log messages Clients have ignored the Named flag since 0.3.2. Fixes bug 28441; bugfix on 0.3.2.1-alpha.	2018-11-14 18:16:34 +10:00
Nick Mathewson	a6a7a1f3ed	Merge branch 'maint-0.3.5'	2018-11-13 16:48:26 -05:00
Nick Mathewson	021187f915	Merge branch 'bug28183_029' into maint-0.3.5	2018-11-13 16:48:21 -05:00
David Goulet	8fb318860e	Merge branch 'maint-0.3.5'	2018-11-13 10:43:03 -05:00
David Goulet	6f2151be9a	Merge branch 'tor-github/pr/487' into maint-0.3.5	2018-11-13 10:37:25 -05:00
Nick Mathewson	42be1c668b	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-13 08:27:29 -05:00
Nick Mathewson	d000e798ac	Merge branch 'maint-0.3.5'	2018-11-13 08:27:29 -05:00
Nick Mathewson	ae4c94bb64	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-13 08:27:29 -05:00
Nick Mathewson	54d1a2d805	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-11-13 08:27:17 -05:00
Nick Mathewson	1a11702a9a	Fix a compiler warning in aes.c. Apparently some freebsd compilers can't tell that 'c' will never be used uninitialized. Fixes bug 28413; bugfix on 0.2.9.3-alpha when we added support for longer AES keys to this function.	2018-11-12 15:39:28 -05:00
Nick Mathewson	0e5378feec	seccomp2: Add "shutdown" to the list of permitted system calls. We don't use this syscall, but openssl apparently does. (This syscall puts a socket into a half-closed state. Don't worry: It doesn't shut down the system or anything.) Fixes bug 28183; bugfix on 0.2.5.1-alpha where the sandbox was introduced.	2018-11-12 08:23:58 -05:00
rl1987	100136ca86	Create new periodic event for pruning old info about Tor routers	2018-11-11 20:31:24 +02:00
Nick Mathewson	e27dff08a3	Merge branch 'maint-0.3.5'	2018-11-11 11:57:54 -05:00
Nick Mathewson	6b2ff4fff8	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-11 11:57:53 -05:00
Nick Mathewson	76ed869ff9	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-11 11:57:53 -05:00
Nick Mathewson	d0c3723c38	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-11-11 11:57:52 -05:00
Karsten Loesing	5ba3d09a89	Update geoip and geoip6 to the November 6 2018 database.	2018-11-11 11:25:59 +01:00
Nick Mathewson	bf4f55a13d	Merge branch 'subsystems'	2018-11-09 15:01:49 -05:00
Nick Mathewson	5d73f87ced	Merge branch 'maint-0.3.5'	2018-11-09 10:49:48 -05:00
Nick Mathewson	591a189fa4	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-09 10:49:47 -05:00
Nick Mathewson	2ac2d0a426	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-09 10:49:47 -05:00
Nick Mathewson	c06b7f090c	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-11-09 10:49:47 -05:00
Nick Mathewson	1ba1a1ceca	Always declare groups when building with openssl 1.1.1 APIs Failing to do on clients was causing TLS 1.3 negotiation to fail. Fixes bug 28245; bugfix on 0.2.9.15, when we added TLS 1.3 support.	2018-11-09 10:10:25 -05:00
Nick Mathewson	c7b6ed1d80	Merge remote-tracking branch 'tor-github/pr/271'	2018-11-07 11:21:13 -05:00
Nick Mathewson	3eeb7c6e26	Merge branch 'maint-0.3.5'	2018-11-07 11:17:32 -05:00
Nick Mathewson	aea2b04467	Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5	2018-11-07 11:16:52 -05:00
Nick Mathewson	9807da9c20	Merge branch 'ticket27225_squashed'	2018-11-07 10:47:29 -05:00
Nick Mathewson	6d93820499	Memoize summarize_protover_flags() Our tests showed that this function is responsible for a huge number of our malloc/free() calls. It's a prime candidate for being memoized. Closes ticket 27225.	2018-11-07 10:47:07 -05:00
Neel Chauhan	f89f14802e	At intro points, don't close circuits on NACKs	2018-11-06 17:04:08 -05:00
Nick Mathewson	c8892b53ec	Merge remote-tracking branch 'tor-github/pr/466'	2018-11-06 15:35:45 -05:00
Nick Mathewson	8020d6fb05	Merge remote-tracking branch 'tor-github/pr/464'	2018-11-06 15:33:25 -05:00
Nick Mathewson	ba28704b29	Merge branch 'maint-0.3.5'	2018-11-06 15:22:11 -05:00
Nick Mathewson	c60f3ea607	Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5	2018-11-06 15:21:45 -05:00
Nick Mathewson	bb9044381e	Merge branch 'maint-0.3.5'	2018-11-06 15:20:01 -05:00
Nick Mathewson	8a5590ebac	Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5	2018-11-06 15:19:04 -05:00
Nick Mathewson	bcba6a4918	Merge branch 'maint-0.3.5'	2018-11-06 15:17:52 -05:00
Nick Mathewson	67abf55d6b	Add a changes file for bug 28303	2018-11-06 15:17:19 -05:00
Roger Dingledine	3a2cb83685	refuse to start with relative paths + RunAsDaemon Resume refusing to start with relative file paths and RunAsDaemon set (regression from the fix for bug 22731). Fixes bug 28298; bugfix on 0.3.3.1-alpha.	2018-11-06 15:50:56 +01:00
Nick Mathewson	313b5b956c	Merge branch 'maint-0.3.5'	2018-11-06 09:16:25 -05:00
Nick Mathewson	9431d35074	Merge branch 'bug28348_034' into bug28348_035	2018-11-06 07:42:55 -05:00
Nick Mathewson	2aff02eb3d	Actually disable NEED_NET periodic events when DisableNetwork is set Fixes bug 28348; bugfix on 0.3.4.1-alpha	2018-11-06 07:40:02 -05:00
Nick Mathewson	adecda7539	changes file for subsystems api (28330)	2018-11-05 09:42:16 -05:00
Neel Chauhan	45b28167d7	In count_acceptable_nodes(), count direct and indirect nodes with node_has_preferred_descriptor()	2018-11-05 08:26:02 -05:00
teor	368aeaadff	Appveyor: Add Windows Server 2016 to tor's build matrix Build tor on Windows Server 2012 R2 and Windows Server 2016 using Appveyor's CI. Closes ticket 28318.	2018-11-05 16:21:58 +10:00
teor	bd0e38dcfe	systemd: allow tor some time to shut down after ShutdownWaitLength expires This commit upstreams the Debian package setting of 60 seconds for TimeoutStopSec, but applies it to startup and shutdown. Part of 28113.	2018-11-05 11:49:19 +10:00
Alex Xu (Hello71)	0d6d3e1f26	Notify systemd of ShutdownWaitLength	2018-11-05 11:46:28 +10:00
Nick Mathewson	865514e66e	Merge branch 'ticket28100_squashed'	2018-11-02 13:19:24 -04:00
Alex Xu (Hello71)	1b75de85b3	Don't overwrite the Content-Type when compressing	2018-11-02 13:19:14 -04:00
Nick Mathewson	f0bd6c2c9d	Merge branch 'maint-0.3.5'	2018-11-02 13:14:37 -04:00
Nick Mathewson	996f24fcd3	Merge branch 'bug27968_squashed' into maint-0.3.5	2018-11-02 13:14:32 -04:00
teor	8f43b8fb47	Avoid a race condition in test_rebind.py If tor terminates due to SIGNAL HALT before test_rebind.py calls tor_process.terminate(), an OSError 3 (no such process) is thrown. Fixes part of bug 27968 on 0.3.5.1-alpha.	2018-11-02 13:14:23 -04:00
Nick Mathewson	f27279f857	Merge remote-tracking branch 'tor-github/pr/449'	2018-11-02 13:11:26 -04:00
Nick Mathewson	d671e3f513	Merge remote-tracking branch 'tor-github/pr/448'	2018-11-02 13:09:45 -04:00
Nick Mathewson	f57fd0318a	Merge remote-tracking branch 'tor-github/pr/397'	2018-11-02 10:01:26 -04:00
Nick Mathewson	a6c7e01584	Merge branch 'bug27963_wallclock' into maint-0.3.5	2018-11-02 09:39:13 -04:00
Nick Mathewson	084a5a13c7	Merge branch 'bug27963_wallclock'	2018-11-02 09:38:26 -04:00
Nick Mathewson	bfe8f50cc8	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-02 09:06:37 -04:00
Nick Mathewson	6bd069630a	Merge branch 'bug26470_032' into maint-0.3.3	2018-11-02 09:06:32 -04:00
Nick Mathewson	f288f2478a	Merge branch 'bug26896_034' into maint-0.3.4	2018-11-02 09:05:14 -04:00
Nick Mathewson	8ed4f1ee84	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-02 09:04:25 -04:00
Nick Mathewson	e847909b71	Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3	2018-11-02 09:04:20 -04:00
George Kadianakis	a0402c6f33	Add changes file for #27707 .	2018-11-01 12:40:52 +02:00
Nick Mathewson	383b44553c	Merge branch 'ticket24393_036_01_squashed'	2018-10-31 11:07:15 -04:00
Nick Mathewson	0d124488f8	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-10-31 11:02:58 -04:00
Nick Mathewson	158db532eb	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-31 11:01:41 -04:00
Nick Mathewson	2a4506776e	Merge branch 'maint-0.3.5'	2018-10-31 11:01:41 -04:00
Nick Mathewson	59043665f8	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-10-31 11:01:41 -04:00
Nick Mathewson	bcc1a71808	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-10-31 11:01:40 -04:00
Nick Mathewson	0a824bd889	Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9	2018-10-31 11:01:36 -04:00
Nick Mathewson	988d4903a3	Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge	2018-10-31 09:04:12 -04:00
Neel Chauhan	067b16eae2	Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths	2018-10-30 15:02:43 -04:00
David Goulet	aa1ae1343a	Merge branch 'maint-0.3.5'	2018-10-30 11:44:14 -04:00
David Goulet	488969fe9c	Merge branch 'tor-github/pr/438' into maint-0.3.5	2018-10-30 11:43:54 -04:00
David Goulet	124c43704c	Merge branch 'maint-0.3.5'	2018-10-30 11:37:44 -04:00
David Goulet	95559279e1	Merge branch 'tor-github/pr/415' into maint-0.3.5	2018-10-30 11:36:36 -04:00
David Goulet	1c5c3f353a	Merge branch 'maint-0.3.5'	2018-10-30 11:29:30 -04:00
David Goulet	6c9d678ff6	hs-v3: Add changes file for 28026 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-30 11:28:53 -04:00
David Goulet	cdb065d6b2	Merge branch 'maint-0.3.5'	2018-10-30 10:55:10 -04:00
Neel Chauhan	9b72dca953	Add changes file for Bug #28127	2018-10-30 10:49:03 -04:00
Nick Mathewson	6ba7f9f0a4	Merge branch 'maint-0.3.5'	2018-10-30 09:35:11 -04:00
Nick Mathewson	97324a731f	Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5	2018-10-30 09:35:07 -04:00
Nick Mathewson	cf2cb783b7	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-30 09:34:04 -04:00
Nick Mathewson	038bc21f88	Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3	2018-10-30 09:33:36 -04:00
Nick Mathewson	30d853a906	Merge remote-tracking branch 'tor-github/pr/425'	2018-10-30 09:16:55 -04:00
Nick Mathewson	084924360a	Merge branch 'ticket23082_squashed'	2018-10-30 09:05:42 -04:00
Nick Mathewson	c19bb4d62e	Merge branch 'maint-0.3.5'	2018-10-30 08:45:49 -04:00
Nick Mathewson	ee1cc0feae	Add a changes file for Alex Crichton's rust fixes.	2018-10-30 08:45:37 -04:00
Nick Mathewson	f6faa76817	Merge branch 'maint-0.3.5'	2018-10-29 15:59:11 -04:00
Nick Mathewson	709cd447f0	Merge branch '27913_rebased_035' into maint-0.3.5	2018-10-29 15:59:06 -04:00
Nick Mathewson	c4b6b57388	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-29 15:57:31 -04:00
Nick Mathewson	fda8b5de78	Merge branch 'maint-0.3.5'	2018-10-29 15:57:31 -04:00
rl1987	cf434b6c80	Add changes file	2018-10-29 15:18:07 -04:00
rl1987	5a3cb495ce	Add changes file	2018-10-29 11:41:36 +02:00
rl1987	4af27e0168	Add changes file	2018-10-29 11:05:55 +02:00
rl1987	b64e1e602b	Add changes file	2018-10-26 12:58:42 +03:00
Nick Mathewson	e9ff3e7d4a	Merge branch 'bug28202_033' into bug28202_035	2018-10-25 09:16:08 -04:00
Nick Mathewson	8013e3e8b6	Merge branch 'bug28202_029' into bug28202_033	2018-10-25 09:14:06 -04:00
Nick Mathewson	368413a321	Fix possible UB in an end-of-string check in get_next_token(). Remember, you can't check to see if there are N bytes left in a buffer by doing (buf + N < end), since the buf + N computation might take you off the end of the buffer and result in undefined behavior. Fixes 28202; bugfix on 0.2.0.3-alpha.	2018-10-25 09:06:13 -04:00
David Goulet	b063ca0604	node: Make node_supports_v3_rendezvous_point() also check for the key It is not enough to look at protover for v3 rendezvous support but also we need to make sure that the curve25519 onion key is present or in other words that the descriptor has been fetched and does contain it. Fixes #27797. Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-24 10:30:26 -04:00
Nick Mathewson	b77889fc5f	Merge branch 'maint-0.3.5'	2018-10-24 10:20:53 -04:00
Nick Mathewson	6851a08090	Merge branch 'ticket28115_035' into maint-0.3.5	2018-10-24 10:20:41 -04:00
Nick Mathewson	c6d3bebb1e	Merge remote-tracking branch 'tor-github/pr/409'	2018-10-24 09:06:29 -04:00
Nick Mathewson	3dc5cce749	Merge branch 'maint-0.3.5'	2018-10-24 08:57:28 -04:00
Nick Mathewson	98e28efa8c	Merge branch 'nss-travis' into maint-0.3.5	2018-10-24 08:57:22 -04:00
Nick Mathewson	05d65cb067	Merge branch 'maint-0.3.5'	2018-10-23 19:22:05 -04:00
Nick Mathewson	289a7dbac3	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-10-23 19:21:44 -04:00
Nick Mathewson	7edc594ee7	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-23 19:18:23 -04:00
Nick Mathewson	169bc670dd	Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3	2018-10-23 19:17:48 -04:00
teor	939657771c	Treat backtrace test failures as expected on most BSD-derived systems Treat backtrace test failures as expected on NetBSD, OpenBSD, and macOS/Darwin, until we solve bug 17808. (FreeBSD failures have been treated as expected since 18204 in 0.2.8.) Fixes bug 27948; bugfix on 0.2.5.2-alpha.	2018-10-23 11:21:10 +10:00
cypherpunks	f874ab2640	dircache: make dirauths reject non UTF-8 descriptors and extrainfo Ticket #27367.	2018-10-23 00:33:51 +00:00
David Goulet	81c466c34a	hs-v3: Create desc signing key cert before uploading Before this commit, we would create the descriptor signing key certificate when first building the descriptor. In some extreme cases, it lead to the expiry of the certificate which triggers a BUG() when encoding the descriptor before uploading. Ticket #27838 details a possible scenario in which this can happen. It is an edge case where tor losts internet connectivity, notices it and closes all circuits. When it came back up, the HS subsystem noticed that it had no introduction circuits, created them and tried to upload the descriptor. However, in the meantime, if tor did lack a live consensus because it is currently seeking to download one, we would consider that we don't need to rotate the descriptors leading to using the expired signing key certificate. That being said, this commit does a bit more to make this process cleaner. There are a series of things that we need to "refresh" before uploading a descriptor: signing key cert, intro points and revision counter. A refresh function is added to deal with all mutable descriptor fields. It in turn simplified a bit the code surrounding the creation of the plaintext data. We keep creating the cert when building the descriptor in order to accomodate the unit tests. However, it is replaced every single time the descriptor is uploaded. Fixes #27838 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-22 16:34:41 -04:00
rl1987	1a1b088f8c	Add changes file	2018-10-20 20:34:08 +03:00
Nick Mathewson	1ae9116601	Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5	2018-10-19 14:20:57 -04:00
Nick Mathewson	a05a113062	Merge remote-tracking branch 'onionk/rust-protocommas1'	2018-10-19 14:20:43 -04:00
Nick Mathewson	f8a1dc64f9	Fix a misspelled macro test that was breaking big-endian OPE Fixes bug 28115; bugfix on 0.3.5.1-alpha.	2018-10-19 08:41:25 -04:00
Nick Mathewson	62401812c7	Merge remote-tracking branch 'dgoulet/ticket27471_035_02'	2018-10-18 13:01:41 -04:00
David Goulet	9ba16c4d03	hs-v3: Close client intro circuits if the descriptor is replaced When storing a descriptor in the client cache, if we are about to replace an existing descriptor, make sure to close every introduction circuits of the old descriptor so we don't have leftovers lying around. Ticket 27471 describes a situation where tor is sending an INTRODUCE1 cell on an introduction circuit for which it doesn't have a matching intro point object (taken from the descriptor). The main theory is that, after a new descriptor showed up, the introduction points changed which led to selecting an introduction circuit not used by the service anymore thus for which we are unable to find the corresponding introduction point within the descriptor we just fetched. Closes #27471. Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-18 12:56:51 -04:00
David Goulet	56f713b8a4	hs-v3: Always generate the descriptor cookie It won't be used if there are no authorized client configured. We do that so we can easily support the addition of a client with a HUP signal which allow us to avoid more complex code path to generate that cookie if we have at least one client auth and we had none before. Fixes #27995 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-18 11:46:07 -04:00
Nick Mathewson	0a41d17c15	Merge branch 'ticket27549_035_01_squashed'	2018-10-18 10:16:30 -04:00
David Goulet	3a8f32067d	hs-v3: Consolidate descriptor cookie computation code Both client and service had their own code for this. Consolidate into one place so we avoid duplication. Closes #27549 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-18 10:16:07 -04:00
Nick Mathewson	d1eac7830f	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-18 09:12:58 -04:00
Taylor Yu	7f6c0fce46	Merge branch 'bug27800-034' into bug27800-035	2018-10-17 16:00:11 -05:00
Taylor Yu	4e7f65ee5d	Merge branch 'bug27800-033' into tor-034	2018-10-17 15:42:58 -05:00
Taylor Yu	93fd924bdb	Log more info for duplicate ed25519 IDs Occasionally, key pinning doesn't catch a relay that shares an ed25519 ID with another relay. Log the identity fingerprints and the shared ed25519 ID when this happens, instead of making a BUG() warning. Fixes bug 27800; bugfix on 0.3.2.1-alpha.	2018-10-17 15:39:55 -05:00
Nick Mathewson	498a852bba	Fold in the entry for 28089	2018-10-17 13:12:24 -04:00
Nick Mathewson	b1891068f1	Merge branch 'maint-0.3.4'	2018-10-17 13:02:23 -04:00
David Goulet	2000d04cb6	conn: Stop writing when our write bandwidth limist is exhausted Commit `488e2b00bf` introduced an issue, most likely introduced by a bad copy paste, that made us stop reading on the connection if our write bandwidth limit was reached. The problem is that because "read_blocked_on_bw" was never set, the connection was never reenabled for reading. This is most likely the cause of #27813 where bytes were accumulating in the kernel TCP bufers because tor was not doing reads. Only relays with RelayBandwidthRate would suffer from this but affecting all relays connecting to them. And using that tor option is recommended and best practice so many many relays have it enabled. Fixes #28089.	2018-10-17 12:25:12 -04:00
Nick Mathewson	e2bfffefb0	Fold changes file into changelog	2018-10-17 09:25:43 -04:00
cypherpunks	2f0744b3e6	rust/tor_util: drop unsafe block in cstr! This is unnecessary just to get an empty string, there's Default::default(). Fix on `8fff331bb0`.	2018-10-17 00:16:21 +00:00
Nick Mathewson	56a3cef4d7	Merge branch 'bug27849_redux'	2018-10-16 17:33:58 -04:00
Nick Mathewson	698629f5a9	Merge remote-tracking branch 'tor-github/pr/404'	2018-10-16 17:29:50 -04:00
rl1987	65864be9bc	Add changes file	2018-10-16 18:04:54 +03:00
David Goulet	b5731cdf2e	mainloop: Set client role if ControlPort is set It turns out that if _only_ the ControlPort is set and nothing else, tor would simply not bootstrap and thus not start properly. Commit `67a41b6306` removed that requirement for tor to be considered a "client". Unfortunately, this made the mainloop enable basically nothing if only the ControlPort is set in the torrc. This commit now makes it that we also consider the ControlPort when deciding if we are a Client or not. It does not revert `67a41b6306` meaning options_any_client_port_set() stays the same, not looking at the control port. Fixes #27849. Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-16 08:11:49 -04:00
Nick Mathewson	b7fbd1f329	Merge branch 'maint-0.3.4'	2018-10-16 08:04:34 -04:00
David Goulet	38599de2dd	test: Update approx_time before the test starts This way we have the same time source when the IP is created and tested later. Fixes #27810 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-16 08:03:55 -04:00
Nick Mathewson	8b3ec74e5f	Merge remote-tracking branch 'public/bug27990'	2018-10-16 08:02:01 -04:00
Nick Mathewson	4983322cc7	Merge branch 'maint-0.3.4'	2018-10-15 10:37:53 -04:00
Nick Mathewson	fd528a0884	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-15 10:37:52 -04:00
Nick Mathewson	dff7d3d00a	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-10-15 10:37:49 -04:00
Nick Mathewson	b113399658	Merge branch 'bug27709_029' into maint-0.2.9	2018-10-15 10:34:39 -04:00
rl1987	9bb00a74bc	Refrain from listener rebinding when address families differ	2018-10-15 16:18:31 +03:00
Nick Mathewson	2c5c17510a	Merge remote-tracking branch 'tor-github/pr/402'	2018-10-14 15:20:39 -04:00
Taylor Yu	36ba506508	report origin of mystery core file Report what program produced the mysterious core file that we occasionally see on Travis CI during make distcheck. Closes ticket 28024.	2018-10-12 15:55:15 -05:00
Nick Mathewson	67351f6724	Merge remote-tracking branch 'tor-github/pr/380'	2018-10-12 11:39:37 -04:00
rl1987	8b5ad246e8	Fix issues that shellcheck found in chutney-git-bisect.sh	2018-10-11 20:28:11 +03:00
Nick Mathewson	717507e3bb	Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9	2018-10-10 17:12:11 -04:00
Taylor Yu	bfab1dda2b	Merge branch 'bug27738-034-merged' into bug27738-master-merged	2018-10-10 15:17:47 -05:00
Taylor Yu	484b259604	Merge branch 'bug27738-033' into bug27738-034	2018-10-10 15:13:02 -05:00
Taylor Yu	cc10873dee	Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033	2018-10-10 15:01:59 -05:00
Nick Mathewson	50ad2545cc	Merge branch 'maint-0.3.4'	2018-10-10 14:27:27 -04:00
Nick Mathewson	48182c147b	Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4	2018-10-10 14:27:24 -04:00
Nick Mathewson	267b8d16b1	Add timeval.h include to compat_pthreads.c for timeradd() OpenSolaris apparently doesn't have timeradd(), so we added a replacement, but we weren't including it here after the big refactoring in 0.3.5.1-alpha. Fixes bug 27963; bugfix on 0.3.5.1-alpha.	2018-10-10 12:19:56 -04:00
Nick Mathewson	a23c36ebcd	Merge branch 'maint-0.3.4'	2018-10-10 11:34:49 -04:00
Nick Mathewson	e5fe8b0e3a	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-10 11:34:49 -04:00
Nick Mathewson	b057623bed	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-10-10 11:34:48 -04:00
Karsten Loesing	119df9c1c0	Update geoip and geoip6 to the October 9 2018 database.	2018-10-10 17:26:41 +02:00
Nick Mathewson	d3d6c59557	Add sys/time.h include back to procmon.c	2018-10-10 11:26:38 -04:00
Nick Mathewson	c6b5b43d92	fixup! Changes file for apveyor changes	2018-10-10 11:10:29 -04:00
Nick Mathewson	8c0009a8de	Changes file for apveyor changes	2018-10-10 10:22:08 -04:00
rl1987	fb1d37f34f	Add changes file	2018-10-07 18:28:04 +03:00
Nick Mathewson	43211c3a0c	Merge remote-tracking branch 'public/bug27893'	2018-10-01 12:12:33 -05:00
Nick Mathewson	58299b2927	Merge remote-tracking branch 'public/bug27728'	2018-10-01 12:06:39 -05:00
Nick Mathewson	a1504f138d	changes file for splitting routerparse.c (#27924 )	2018-10-01 11:45:11 -05:00
Nick Mathewson	9e65e7a36f	Merge branch 'split_stats'	2018-09-27 16:26:06 -04:00
Nick Mathewson	d0b2b5a202	Always initialize the periodic events list. Various places in our code try to activate these events or check their status, so we should make sure they're initialized as early as possible. Fixes bug 27861; bugfix on 0.3.5.1-alpha.	2018-09-27 13:24:36 -04:00
Nick Mathewson	8812f562a0	Fix a memory leak in --dump-config When freeing a configuration object from confparse.c in dump_config(), we need to call the appropriate higher-level free function (like or_options_free()) and not just config_free(). This only happens with options (since they're the one where options_validate allocates extra stuff) and only when running --dump-config with something other than minimal (since OPTIONS_DUMP_MINIMAL doesn't hit this code). Fixes bug 27893; bugfix on 0.3.2.1-alpha.	2018-09-27 13:05:19 -04:00
Nick Mathewson	013a123833	Changes file for splitting stats	2018-09-27 10:30:17 -04:00
Nick Mathewson	de0b07c634	Merge branch 'router_split'	2018-09-26 09:47:59 -04:00
Nick Mathewson	5e5e019b31	Merge remote-tracking branch 'dgoulet/bug27550_035_01'	2018-09-26 08:36:09 -04:00
Nick Mathewson	3a643078c1	Changes file for splitting router.c	2018-09-25 18:54:17 -04:00
cypherpunks	fcbbcf92cb	add --enable-nss build to Travis CI	2018-09-25 18:43:23 +00:00
rl1987	c82163dff4	Fix reference to socks-extensions.txt in tor-resolve manpage	2018-09-25 12:39:27 +03:00
David Goulet	18085abfcc	hs-v3: Silence some logging for client authorization If a tor client gets a descriptor that it can't decrypt, chances are that the onion requires client authorization. If a tor client is configured with client authorization for an onion but decryption fails, it means that the configured keys aren't working anymore. In both cases, we'll log notice the former and log warn the latter and the rest of the decryption errors are now at info level. Two logs statement have been removed because it was redundant and printing the fetched descriptor in the logs when 80% of it is encrypted wat not helping. Fixes #27550 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-24 12:49:00 -04:00
Nick Mathewson	6b90972dc6	Merge branch 'pr_339_squashed'	2018-09-24 11:25:39 -04:00
rl1987	d49133d9ca	Mention that we require Python 2.7 or newer	2018-09-24 11:25:33 -04:00
Nick Mathewson	9767cf8cc0	Merge branch 'bug26913_033'	2018-09-24 11:17:09 -04:00
Nick Mathewson	112e5fa7ec	Merge branch 'maint-0.3.4'	2018-09-24 11:10:56 -04:00
Nick Mathewson	f57d8722e0	Fix the 0.3.4 part of bug 27781 (arm compilation) Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we need to include crypto_util.h here.	2018-09-24 11:08:27 -04:00
Nick Mathewson	78295904f7	Merge branch 'ticket26744'	2018-09-24 10:56:50 -04:00
Nick Mathewson	169f238c23	Merge remote-tracking branch 'onionk/protover-rust1'	2018-09-21 16:28:32 -04:00
cypherpunks	5c0dd1aa90	move protover_rust.c to core/or/ Missed in `667a6e8fe9`.	2018-09-21 20:14:53 +00:00
Nick Mathewson	63e08f56b8	Merge remote-tracking branch 'tor-github/pr/365'	2018-09-21 16:13:59 -04:00
Nick Mathewson	b7bd162af7	Merge remote-tracking branch 'dgoulet/ticket27774_035_03'	2018-09-21 13:02:12 -04:00
Nick Mathewson	194acfb51d	Split directory.c code into several modules Parts of this C file naturally belong in dircache, dirclient, and dircommon: so, move them there.	2018-09-21 12:57:22 -04:00
Nick Mathewson	0e4c42a912	Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'	2018-09-21 09:40:16 -04:00
David Goulet	36be6f0d2d	fixup! hs-v3: Silence some logging for client authorization	2018-09-21 09:39:21 -04:00
Nick Mathewson	a1b0283040	Changes file for #26747	2018-09-21 09:38:51 -04:00
Nick Mathewson	9b0a17a74f	Merge branch 'maint-0.3.4'	2018-09-21 09:36:31 -04:00
Nick Mathewson	e818a71905	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-21 09:35:54 -04:00
Nick Mathewson	2cadd93cea	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-21 09:35:51 -04:00
Nick Mathewson	5b04392c15	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-21 09:35:23 -04:00
Nick Mathewson	96d1f2e6d0	Merge remote-tracking branch 'dgoulet/ticket27797_035_01'	2018-09-21 09:33:03 -04:00
David Goulet	79265a6fb6	hs-v3: Don't BUG() if the RP node_t is invalid client side When sending the INTRODUCE1 cell, we acquire the needed data for the cell but if the RP node_t has invalid data, we'll fail the send and completely kill the SOCKS connection. Instead, close the rendezvous circuit and return a transient error meaning that Tor can recover by selecting a new rendezvous point. We'll also do the same when we are unable to encode the INTRODUCE1 cell for which at that point, we'll simply take another shot at a new rendezvous point. Fixes #27774 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-21 08:44:12 -04:00
rl1987	53d8aa1368	Add changes file	2018-09-21 10:57:41 +03:00
cypherpunks	42558df7c8	rust/protover: return C-allocated string in protover_all_supported() The result of CString::into_raw() is not safe to free with free() except under finicky and fragile circumstances that we definitely don't meet right now. This was missed in `be583a34a3`.	2018-09-21 05:16:22 +00:00
cypherpunks	db89b4b152	rust/protover: fix null deref in protover_all_supported() Fortunately with the current callers it couldn't happen in practice. Fix on `d1820c1516`.	2018-09-21 04:57:26 +00:00
Nick Mathewson	de066b76a5	Start on an 0.3.5.2-alpha changelog	2018-09-20 16:35:36 -04:00
Nick Mathewson	313b67163a	changes for 27799	2018-09-20 16:30:33 -04:00
Nick Mathewson	2ed0d240e8	Merge remote-tracking branch 'dgoulet/ticket27410_032_01'	2018-09-20 16:22:02 -04:00
Nick Mathewson	d6c564e09a	Use the correct macro to detect an invalid socket in tortls_nss.c Fixes bug 27782; bugfix on 0.3.5.1-alpha	2018-09-20 12:55:31 -04:00
Nick Mathewson	f25323fe3f	Fix socket accounting with ORConn sockets. When we close a socket via tor_tls_free(), we previously had no way for our socket accounting logic to learn about it. This meant that the socket accounting code would think we had run out of sockets, and freak out. Fixes bug 27795; bugfix on 0.3.5.1-alpha.	2018-09-20 12:52:29 -04:00
David Goulet	fa6d5dd268	hs-v3: Close all SOCKS request on descriptor failure Client side, when a descriptor is finally fetched and stored in the cache, we then go over all pending SOCKS request for that descriptor. If it turns out that the intro points are unusable, we close the first SOCKS request but not the others for the same .onion. This commit makes it that we'll close all SOCKS requests so we don't let hanging the other ones. It also fixes another bug which is having a SOCKS connection in RENDDESC_WAIT state but with a descriptor in the cache. At some point, tor will expire the intro failure cache which will make that descriptor usable again. When retrying all SOCKS connection (retry_all_socks_conn_waiting_for_desc()), we won't end up in the code path where we have already the descriptor for a pending request causing a BUG(). Bottom line is that we should never have pending requests (waiting for a descriptor) with that descriptor in the cache (even if unusable). Fixees #27410. Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-20 11:01:23 -04:00
Nick Mathewson	1f377e910f	Merge branch 'maint-0.3.4'	2018-09-20 10:43:08 -04:00
Nick Mathewson	163230e240	Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4	2018-09-20 10:43:05 -04:00
David Goulet	e3713f17fb	node: Make node_supports_v3_rendezvous_point() also check for the key It is not enough to look at protover for v3 rendezvous support but also we need to make sure that the curve25519 onion key is present or in other words that the descriptor has been fetched and does contain it. Fixes #27797. Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-20 08:50:27 -04:00
Nick Mathewson	ea5792f333	Make crypto_strongest_rand() non-mockable Instead, have it call a mockable function. We don't want crypto_strongest_rand() to be mockable, since doing so creates a type error when we call it from ed25519-donna, which we do not build in a test mode. Fixes bug 27728; bugfix on 0.3.5.1-alpha	2018-09-18 12:40:18 -04:00
teor	7bf9c93ab3	Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035 Resolve conflicts due to rustfmt, and run rustfmt on the merged code.	2018-09-18 23:32:57 +10:00
Nick Mathewson	50367d06f2	Merge remote-tracking branch 'tor-github/pr/352'	2018-09-18 08:44:58 -04:00
Nick Mathewson	52191064ac	Merge branch 'maint-0.3.4'	2018-09-18 08:33:13 -04:00
Nick Mathewson	2ddbaf9cdc	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-18 08:31:14 -04:00
Nick Mathewson	75b95e1c8e	Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3	2018-09-18 08:31:08 -04:00
Nick Mathewson	4199c8b2d0	Merge remote-tracking branch 'github/bug27073_029'	2018-09-18 08:16:42 -04:00
Nick Mathewson	5ef998fbf5	Changes file for 27764	2018-09-18 08:12:46 -04:00
teor	3eafa61f63	check-changes: Warn about bugfixes on future releases Warn when bugfix changes files say that the bug is in a future release. Closes ticket 27761.	2018-09-18 20:40:50 +10:00
teor	7e862c3ec0	check-changes: Check bugfix version formatting Check that bugfix versions in changes files look like Tor versions from the versions spec. Part of ticket 27761.	2018-09-18 20:40:44 +10:00
teor	e81001a088	Merge branch 'bug27738-029' into bug27738-032 Resolve conflicts due to modified comments, and deleted lines.	2018-09-18 19:34:53 +10:00
teor	e8c7d7d3be	Travis: use the Homebrew addon Use the Travis Homebrew addon to install packages on macOS. The package list is the same, but the Homebrew addon does not do a `brew update` by default. This makes builds faster, at the cost of using slightly older packages. Implements ticket 27738.	2018-09-18 19:26:54 +10:00
Mike Perry	8a83c4b613	Merge branch 'bug23512-v4-033' into bug23512-v4-master	2018-09-18 00:17:14 +00:00
Mike Perry	72cef61028	Merge branch 'bug23512-v4-032' into bug23512-v4-033	2018-09-17 23:31:34 +00:00
Mike Perry	36e81e1f59	Merge branch 'bug23512-v4-029' into bug23512-v4-032	2018-09-17 23:12:45 +00:00
Mike Perry	2ceda207d3	Bug 23512: Changes file.	2018-09-17 22:19:43 +00:00
Nick Mathewson	80ad15921c	Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix.	2018-09-17 11:57:56 -04:00
Nick Mathewson	4fd761a418	Make CacheDirectoryGroupReadable an autobool. Since the default cache directory is the same as the default data directory, we don't want the default CacheDirectoryGroupReadable value (0) to override an explicitly set "DataDirectoryGroupReadable 1". To fix this, I'm making CacheDirectoryGroupReadable into an autobool, and having the default (auto) value mean "Use the value of DataDirectoryGroupReadable if the directories are the same, and 0 otherwise." Fixes bug 26913; bugfix on 0.3.3.1-alpha when the CacheDirectory option was introduced.	2018-09-17 11:44:59 -04:00
Nick Mathewson	b96e2ab341	Start a changelog for 0.3.5.1-alpha	2018-09-17 09:12:10 -04:00
cypherpunks	1ed5e009cb	rust/protover: reject extra commas The C implementation had gotten this wrong too, in a slightly different way. Introduced in `5af03c1ef3`. Fixes #27197; bugfix on 0.3.3.3-alpha.	2018-09-15 23:19:31 +00:00
George Kadianakis	27d7491f5a	Introduce per-service HiddenServiceExportCircuitID torrc option. Moves code to a function, better viewed with --color-moved.	2018-09-15 16:31:22 +03:00
Nick Mathewson	4bdba5fa4b	Merge branch 'maint-0.3.4'	2018-09-14 12:56:31 -04:00
Nick Mathewson	6f47734ea8	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-14 12:56:30 -04:00
Nick Mathewson	a546e07600	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-14 12:56:30 -04:00
David Goulet	0971b3ce4d	hs-v3: Don't BUG() on directory permission check failure In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-14 12:56:26 -04:00
David Goulet	33c99cf565	hs-v2: Demote log warning to info when we don't have a consensus Fixes #27040 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-14 12:04:01 -04:00
Nick Mathewson	bb465be085	Revise our assertion and bug macros to work with -Wparentheses On GCC and Clang, there's a feature to warn you about bad conditionals like "if (a = b)", which should be "if (a == b)". However, they don't warn you if there are extra parentheses around "a = b". Unfortunately, the tor_assert() macro and all of its kin have been passing their inputs through stuff like PREDICT_UNLIKELY(expr) or PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more parentheses around "expr", thus suppressing these warnings. To fix this, this patch introduces new macros that do not wrap expr. They're only used when GCC or Clang is enabled (both define __GNUC__), since they require GCC's "({statement expression})" syntax extension. They're only used when we're building the unit-test variant of the object files, since they suppress the branch-prediction hints. I've confirmed that tor_assert(), tor_assert_nonfatal(), tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give compiler warnings when their argument is an assignment expression. Fixes bug 27709. Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro.	2018-09-14 11:39:37 -04:00
cypherpunks	c613d55134	rust/protover: use .and_not_in() instead of .retain() in all_supported() .retain() would allocating a Vec of billions of integers and check them one at a time to separate the supported versions from the unsupported. This leads to a memory DoS. Closes ticket 27206. Bugfix on `e6625113c9`.	2018-09-14 15:08:55 +00:00
Nick Mathewson	8f689e0eb2	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-14 10:48:01 -04:00
Nick Mathewson	7e406ec40f	Merge branch 'maint-0.3.4'	2018-09-14 10:48:01 -04:00
Nick Mathewson	281854bab7	If options_act() fails, restore the previous value of global_options Before 0.3.3.1-alpha, we would exit() in this case immediately. But now that we leave tor_main() more conventionally, we need to make sure we restore things so as not to cause a double free. Fixes bug 27708; bugfix on 0.3.3.1-alpha.	2018-09-14 10:34:45 -04:00
Nick Mathewson	dbb0abc9f1	Tweak changes file: call this a major feature.	2018-09-14 09:32:53 -04:00
Nick Mathewson	12320e7f3e	Merge remote-tracking branch 'neel/b21530'	2018-09-14 09:27:03 -04:00
Nick Mathewson	82b1282772	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-14 09:25:34 -04:00
Nick Mathewson	84e3ada71b	Merge remote-tracking branch 'onionk/rust-protokeyword1-035'	2018-09-14 09:25:31 -04:00
Nick Mathewson	bb012d7941	Merge remote-tracking branch 'tor-github/pr/329'	2018-09-14 09:22:23 -04:00
Nick Mathewson	b67f3b751a	Merge branch 'ticket27247'	2018-09-14 09:14:12 -04:00
Nick Mathewson	9a90f4c6b4	Changes file for the 32-bit msec conversion fixes of #27139	2018-09-14 08:49:27 -04:00
cypherpunks	bf9dc697fa	Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035	2018-09-14 02:33:59 +00:00
cypherpunks	574d59c640	Merge branch 'rust-protokeyword1' into rust-protokeyword1-034	2018-09-14 02:26:31 +00:00
cypherpunks	e24195c7c1	protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on `b2b2e1c7f2`. Fixes #27316; bugfix on 0.2.9.4-alpha.	2018-09-14 02:18:04 +00:00
Nick Mathewson	7a0ff5beb2	In conditionvar_timeout test, wait for threads to timeout Previously we just waited 200msec, which was not enough on slow/busy systems. Fixes bug 27073; bugfix on 0.2.6.3-alpha when the test was introduced.	2018-09-13 20:47:41 -04:00
Nick Mathewson	b943721b2a	Merge branch 'bug27224_take2_squashed'	2018-09-13 16:43:06 -04:00
rl1987	1e77376e1a	Avoid calling node_get_all_orports() from node_is_a_configured_bridge() All node_get_all_orports() does is allocate and return a smartlist with at most two tor_addr_port_t members that match ORPort's of node configuration. This is harmful for memory efficiency, as it allocates the same stuff every time it is called. However, node_is_a_configured_bridge() does not need to call it, as it already has all the information to check if there is configured bridge for a given node. The new code is arranged in a way that hopefully makes each succeeding linear search through bridge_list less likely.	2018-09-13 16:38:33 -04:00
Nick Mathewson	eaf7d16826	Merge branch 'ticket23846'	2018-09-13 14:51:21 -04:00
Nick Mathewson	85aba48a66	Merge branch 'bug26470_032'	2018-09-13 13:53:42 -04:00
Mike Perry	e86593c40d	Ticket #27678 : Changes file.	2018-09-13 17:46:11 +00:00
Nick Mathewson	3adef11d10	Changes file for 27186	2018-09-13 13:37:29 -04:00
Nick Mathewson	787da5185c	Merge remote-tracking branch 'onionk/strcmpstart1'	2018-09-13 13:30:53 -04:00
cypherpunks	7c26f88fd7	rust/protover: validate unknown protocol names use only allowed characters	2018-09-13 16:33:58 +00:00
Nick Mathewson	db27a70c94	Merge branch 'ticket27547_035_01_squashed'	2018-09-13 11:48:13 -04:00
David Goulet	e7ab20710c	hs-v3: Add changes file and man page for client authorization Closes #27547 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-09-13 11:47:58 -04:00
Nick Mathewson	9697c2da46	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-13 11:46:04 -04:00
Nick Mathewson	3ddfd5ff25	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-13 11:46:04 -04:00
Nick Mathewson	8253428253	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-13 11:46:04 -04:00
Nick Mathewson	d44eb16b23	Merge branch 'maint-0.3.4'	2018-09-13 11:46:04 -04:00
Nick Mathewson	f308e81fa7	Merge branch 'maint-0.3.4'	2018-09-12 17:25:40 -04:00
Nick Mathewson	f8d5fb42a3	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-12 17:24:41 -04:00
Nick Mathewson	b4f20ec8a6	Merge remote-tracking branch 'tor-github/pr/280'	2018-09-12 16:13:23 -04:00
cypherpunks	4fa46fca8e	fixup! changes file	2018-09-12 14:22:31 +00:00
Nick Mathewson	0aec613a78	Add an --enable-pic option for people who hack Tor into libraries Closes ticket 23846	2018-09-12 10:10:29 -04:00
cypherpunks	ab91302fd0	nodelist: use strcmpstart() instead of strncmp() in rend_parse_v2_service_descriptor. Fix on `c58675ca72`	2018-09-12 14:03:06 +00:00
Nick Mathewson	19dbc385d5	Merge remote-tracking branch 'tor-github/pr/298'	2018-09-12 09:38:52 -04:00
Nick Mathewson	62743912bc	Merge branch 'pr278_squashed'	2018-09-12 09:06:35 -04:00
rl1987	c9c16ee8a4	Add changes file	2018-09-12 09:06:16 -04:00
Nick Mathewson	73a37d1e54	Check waitpid return value and exit status in tinytest.c It's possible for a unit test to report success via its pipe, but to fail as it tries to clean up and exit. Notably, this happens on a leak sanitizer failure. Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was introduced.	2018-09-12 08:57:18 -04:00
Nick Mathewson	0dbd4fe309	Merge branch 'maint-0.3.4'	2018-09-12 08:17:45 -04:00
Nick Mathewson	73ba308d3d	Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4	2018-09-12 08:17:42 -04:00
Nick Mathewson	8294c40c96	Merge remote-tracking branch 'tor-github/pr/318'	2018-09-12 08:12:19 -04:00
cypherpunks	03c4d0ab9c	rust/protover: fix check for overlapping ranges Closes ticket 27649. Bugfix on `e6625113c9`.	2018-09-12 02:47:59 +00:00
Nick Mathewson	5a2374b074	Merge remote-tracking branch 'tor-github/pr/315'	2018-09-11 15:55:30 -04:00
Nick Mathewson	affbe376f9	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-11 15:53:06 -04:00
Mike Perry	ae1aea4cc4	Bug 25505: Check circuitmux queues before padding.	2018-09-11 15:53:03 -04:00
Nick Mathewson	2d0a6d7691	Merge remote-tracking branch 'mikeperry/bug25505'	2018-09-11 14:32:39 -04:00
Nick Mathewson	7852499812	Merge remote-tracking branch 'tor-github/pr/312'	2018-09-11 14:05:16 -04:00
Nick Mathewson	042a9fd8b0	Merge branch 'maint-0.3.4'	2018-09-11 13:09:21 -04:00
Nick Mathewson	46bccc50e5	Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4	2018-09-11 13:09:18 -04:00
Nick Mathewson	8e714d2a02	Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3	2018-09-11 13:09:09 -04:00
Nick Mathewson	c3a750486c	Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2	2018-09-11 13:09:04 -04:00
Nick Mathewson	198b6354e6	Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9	2018-09-11 13:08:57 -04:00
Nick Mathewson	8a873a5695	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-11 12:04:56 -04:00
Nick Mathewson	8afc100cb5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-11 12:04:56 -04:00
Nick Mathewson	f741505642	Merge branch 'maint-0.3.4'	2018-09-11 12:04:56 -04:00
Nick Mathewson	3119cb5062	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-11 12:04:55 -04:00
Nick Mathewson	81a5448c18	Changes file for feature27244	2018-09-11 11:54:37 -04:00
Karsten Loesing	19429fac23	Update geoip and geoip6 to the September 6 2018 database.	2018-09-11 09:26:59 +02:00
Taylor Yu	617160895c	Defer reporting directory bootstrap progress Existing cached directory information can cause misleadingly high bootstrap percentages. To improve user experience, defer reporting of directory information progress until at least one connection has succeeded to a relay or bridge. Closes ticket 27169.	2018-09-10 15:20:50 -05:00
rl1987	1e296bc6de	Call event_set_mem_functions during initialization	2018-09-09 18:58:03 +03:00
Nick Mathewson	33a0c619a8	Do not store cached_dir_t for consensus in RAM if not a dircache. There are three reasons we use a cached_dir_t to hold a consensus: 1. to serve that consensus to a client 2. to apply a consensus diff to an existing consensus 3. to send the consensus to a controller. But case 1 is dircache-only. Case 2 and case 3 both fall back to networkstatus_read_cached_consensus(). So there's no reason for us to store this as a client. Avoiding this saves about 23% of our RAM usage, according to our experiments last month. This is, semantically, a partial revert of `e5c608e535`. Fixes bug 27247; bugfix on 0.3.0.1-alpha.	2018-09-07 19:48:56 -04:00
Nick Mathewson	859d744eb8	in master, remove changes files for already-merged changes	2018-09-07 09:39:54 -04:00
Nick Mathewson	732ea9120c	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 09:15:56 -04:00
Nick Mathewson	8849b2ca3c	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-07 09:15:56 -04:00
Nick Mathewson	ee6d8bcf71	Merge branch 'maint-0.3.4'	2018-09-07 09:15:56 -04:00
Nick Mathewson	0366ae224c	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 09:15:52 -04:00
Nick Mathewson	2ec88a2a6d	Tell openssl to build its TLS contexts with security level 1 Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024.	2018-09-07 09:15:06 -04:00
Nick Mathewson	291876be36	Merge branch 'maint-0.3.4'	2018-09-07 08:48:23 -04:00
Nick Mathewson	967cef2f8f	Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4	2018-09-07 08:48:19 -04:00
Nick Mathewson	579770b706	Merge branch 'maint-0.3.4'	2018-09-07 08:46:46 -04:00
Nick Mathewson	056003d602	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:46:45 -04:00
Nick Mathewson	a78504dbe6	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-07 08:46:45 -04:00
Nick Mathewson	eacaff6ccc	Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2	2018-09-07 08:46:41 -04:00
Nick Mathewson	9fcb3ef787	Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9	2018-09-07 08:46:35 -04:00
Nick Mathewson	7e91eb83d8	Merge branch 'maint-0.3.4'	2018-09-07 08:45:10 -04:00
Nick Mathewson	df18cf0e8f	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:44:40 -04:00
Nick Mathewson	a4930de5e9	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-07 08:44:40 -04:00
Nick Mathewson	a5ed62f96c	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 08:44:39 -04:00
Nick Mathewson	912ae2b8dc	Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9	2018-09-07 08:44:36 -04:00
Nick Mathewson	08d5fd39d8	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:42:19 -04:00
Nick Mathewson	b6de39e5f4	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-07 08:42:19 -04:00
Nick Mathewson	a08e6e711f	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 08:42:19 -04:00
teor	e70cf82625	Appveyor: Disable gcc hardening in Windows 64-bit builds As of August 29, 2018, Appveyor images come with gcc 8.2.0 by default. 64-bit Windows executables compiled with gcc 8.2.0 and tor's --enable-gcc-hardening crash. Fixes bug 27460; bugfix on 0.3.4.1-alpha.	2018-09-07 13:52:20 +10:00
teor	d2105ff5d5	Merge branch 'bug27461-029' into bug27461-032 Fix a minor merge conflict due to an #endif comment.	2018-09-07 13:00:34 +10:00
teor	8ef4bb7f3e	Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows It is not supported, and always fails. Some compilers warn about the function pointer cast on 64-bit Windows. Fixes bug 27461; bugfix on 0.2.2.23-alpha.	2018-09-07 12:58:11 +10:00
teor	9d5c6317b5	hs: Silence a spurious warning in rend_client_send_introduction() gcc 8 warns that extend_info_t.nickname might be truncated by strncpy(). But it doesn't know that nickname can either contain a hex id, or a nicknames. hex ids are only used for general and HSDir circuits. Fixes bug 27463; bugfix on 0.1.1.2-alpha.	2018-09-07 12:40:11 +10:00
teor	1570f17f97	Windows: Silence a spurious warning in the GetAdaptersAddresses cast GetProcAddress() returns FARPROC, which is (long long int()()) on 64-bit Windows: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx But GetAdaptersAddresses() is (long unsigned int()()), on both 32-bit and 64-bit Windows: https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses So gcc 8 issues a spurious "incompatible function pointer" warning about the cast to GetAdaptersAddresses_fn_t. Silence this warning by casting to a void function pointer, before the cast to GetAdaptersAddresses_fn_t. This issue is already fixed by 26481 in 0.3.5 and later, by removing the lookup and cast. Fixes bug 27465; bugfix on 0.2.3.11-alpha.	2018-09-07 11:03:10 +10:00
Nick Mathewson	8815960c46	Merge remote-tracking branch 'tor-github/pr/294'	2018-09-06 09:47:32 -04:00
Nick Mathewson	6edee54afa	Changes file for 25132	2018-09-06 09:31:39 -04:00
Nick Mathewson	bcfab63ca5	Merge remote-tracking branch 'teor/ticket27467'	2018-09-06 09:24:47 -04:00
teor	d0965561a5	Remove GetAdaptersAddresses_fn_t The code that used it was removed as part of the 26481 refactor. Closes ticket 27467.	2018-09-06 12:54:03 +10:00
Nick Mathewson	06c14f9209	Merge branch 'maint-0.3.4'	2018-09-05 10:16:11 -04:00
Nick Mathewson	2b04163666	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-05 10:16:06 -04:00
Nick Mathewson	a7e72f0c44	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-05 10:15:45 -04:00
Nick Mathewson	57b207efa4	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-05 10:15:42 -04:00
Nick Mathewson	ff1486385a	Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9	2018-09-05 10:14:56 -04:00
Nick Mathewson	75da2045c5	Merge branch 'maint-0.3.4'	2018-09-05 10:01:31 -04:00
Nick Mathewson	b390983b27	Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4	2018-09-05 10:01:27 -04:00
Nick Mathewson	67bdd144bd	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-05 09:56:19 -04:00
Nick Mathewson	2b1b8bf2ca	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-05 09:56:19 -04:00
Nick Mathewson	2f618094d2	Merge branch 'maint-0.3.4'	2018-09-05 09:56:19 -04:00
Nick Mathewson	4ab033c3bc	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-09-05 09:56:19 -04:00
teor	d6779a9013	Stop reinstalling identical packages in our Windows CI Fixes bug 27464; bugfix on 0.3.4.1-alpha.	2018-09-05 21:23:28 +10:00
teor	35b0ac8d84	Travis: don't call echo with a --flag as the first argument When we use echo in Travis, don't pass a --flag as the first argument. Fixes bug 27418; bugfix on 0.3.4.7-rc.	2018-09-05 14:02:46 +10:00
teor	d3a3ac013d	Appveyor: tail config.log and cat test-suite.log after failed builds Also zip the full logs, and upload them as build artifacts. Implements ticket 27430.	2018-09-05 13:51:12 +10:00
teor	4e4b6a2476	Travis: when showing a log fails, keep trying to show other logs When a Travis build fails, and showing a log fails, keep trying to show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc.	2018-09-05 13:12:54 +10:00
teor	90e038e732	Appveyor: always log the compiler path and version Implements 27449.	2018-09-05 10:50:17 +10:00
Nick Mathewson	0db5c54957	Merge branch 'nss_squashed' into nss_merge	2018-09-04 20:21:07 -04:00
Nick Mathewson	c18967d6c8	changes file for our NSS support	2018-09-04 14:52:35 -04:00
Nick Mathewson	fd994f55c4	Merge remote-tracking branch 'rl1987/doc26908'	2018-09-04 11:08:49 -04:00
Nick Mathewson	3507fead10	Merge branch 'tor_api_owning_control'	2018-09-04 11:04:21 -04:00
Nick Mathewson	94b04d6c64	Merge branch 'bug24104_029_squashed'	2018-09-04 10:44:36 -04:00
cypherpunks	f8c0f694b7	app/config: reject non-UTF-8 ContactInfo Closes ticket #27428.	2018-09-03 14:31:03 +00:00
rl1987	19f73f6336	Add changes file	2018-09-02 21:14:03 +03:00
juga0	bbb82a5249	Add changes file	2018-09-01 18:47:20 -04:00
rl1987	1baa2703c3	Add changes file	2018-08-31 20:05:54 +03:00
Nick Mathewson	94605f08fb	Merge branch 'ticket27246_035_01_squashed'	2018-08-29 15:05:05 -04:00
Nick Mathewson	7f1895c39a	Changes for 27246	2018-08-29 15:02:59 -04:00
Mike Perry	93ff8b411a	Merge branch 'ticket25573-034' into ticket25573-master	2018-08-29 17:10:06 +00:00
Nick Mathewson	a28c14aad5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-29 11:17:31 -04:00
Nick Mathewson	b40f9967fa	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-29 11:17:31 -04:00
Nick Mathewson	0ea622aa3a	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-29 11:17:31 -04:00
Nick Mathewson	810152b20f	Merge branch 'maint-0.3.4'	2018-08-29 11:17:31 -04:00
Mike Perry	c56f63eadb	Ticket #25573 : Track half-closed stream ids We allow their CONNECTEDs, RESOLVEDs, ENDs, SENDMEs, and DATA cells to not count as dropped until the windows are empty, or we get an END. This commit does not change behavior. It only changes CIRC_BW event field values.	2018-08-29 04:12:09 +00:00
teor	541b89b061	Test: avoid spurious failures in make test-network-all Before running make test-network-all, delete old logs and test result files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.	2018-08-29 10:47:20 +10:00
Nick Mathewson	48632455a5	Merge branch 'bug26367_035_01'	2018-08-28 16:02:04 -04:00
David Goulet	4976eca826	hs: Render obsolete Tor2web Remove support for Tor2web in the code and build system. At this commit, tor doesn't have Tor2web support anymore. Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html Close #26367 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-08-28 16:01:57 -04:00
Nick Mathewson	b1d32a9223	Merge remote-tracking branch 'dgoulet/ticket27215_035_01'	2018-08-28 16:00:45 -04:00
David Goulet	4e2dcda092	fixup! hs: Change default version from 2 to 3	2018-08-28 15:58:28 -04:00
Nick Mathewson	2bc4c55d7d	Merge remote-tracking branch 'tor-github/pr/245'	2018-08-28 15:44:06 -04:00
Nick Mathewson	3b960df4f9	Merge branch 'bug26896_034'	2018-08-28 12:35:50 -04:00
rl1987	3890ad2578	Stricter HiddenServicePort parsing	2018-08-28 18:32:31 +03:00
Nick Mathewson	64c3c6a790	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-27 09:39:08 -04:00
Nick Mathewson	0483f7f64c	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-27 09:39:08 -04:00
Nick Mathewson	103dd68ba8	Merge branch 'maint-0.3.4'	2018-08-27 09:39:08 -04:00
teor	70a07fa90b	When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha.	2018-08-27 23:07:20 +10:00
Nick Mathewson	4c3b43604b	Merge remote-tracking branch 'teor/ticket27211'	2018-08-24 12:45:42 -04:00
Nick Mathewson	622231ce2e	Merge remote-tracking branch 'teor/bug27237'	2018-08-24 12:44:46 -04:00
Nick Mathewson	b1d0fa04fb	Merge branch 'maint-0.3.4'	2018-08-24 12:35:26 -04:00
Nick Mathewson	658171318f	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-24 12:35:23 -04:00
Nick Mathewson	33e4e30d0a	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-24 12:32:10 -04:00
Nick Mathewson	98e1a1d106	Merge branch 'ticket27286_032_v2' into maint-0.3.2	2018-08-24 12:32:06 -04:00
Nick Mathewson	14be9cba4e	Update the protocol versions recommendations to remove LinkAuth=1 LinkAuth method 1 is the one where we pull the TLS master secrets out of the OpenSSL data structures and authenticate them with RSA. Right now we list method 1 as required for clients and relays. That's a problem, since we can't reasonably support it with NSS. So let's remove it as a requirement and a recommendation. As for method 3: I'd like to recommend it it, but that would make 0.2.9 start warning. Let's not do that till at least some time after 0.3.5 (the next LTS) is stable. Closes ticket 27286	2018-08-24 12:31:01 -04:00
Nick Mathewson	49fe7f24d6	Remove changes entries for stuff that is already in maint-0.3.4	2018-08-24 09:15:34 -04:00
teor	7a5896d5d4	Bootstrap: try harder to get descriptors in non-exit test networks Use the mid weight for the third hop when there are no exits. Fixes bug 27237; bugfix on 0.2.6.2-alpha.	2018-08-24 12:49:05 +10:00
teor	4217dc0558	Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney Supports bisection on 0.3.4 and earlier. Recommend that users copy the script before bisecting. Implements ticket 27211.	2018-08-24 12:46:04 +10:00
Nick Mathewson	d0007db1f0	Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4	2018-08-23 20:44:06 -04:00
teor	8425091718	Appveyor CI: Changes file for 26979 Closes 26979.	2018-08-24 10:11:20 +10:00
Nick Mathewson	9323f5d1d4	Merge branch 'maint-0.3.4'	2018-08-23 20:07:47 -04:00
Nick Mathewson	90f6c590af	Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4	2018-08-23 20:07:39 -04:00
teor	08ad1f1e46	CI: Only post Appveyor IRC notifications when the build fails Implements 27275.	2018-08-24 10:06:06 +10:00
Nick Mathewson	d50f90bfc4	Merge branch 'maint-0.3.4'	2018-08-23 19:37:32 -04:00
Nick Mathewson	e01ea64f0a	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-23 19:36:45 -04:00
Nick Mathewson	36bb11a650	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-23 19:36:45 -04:00
Nick Mathewson	6e0872e867	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-23 19:36:45 -04:00
teor	cc4ea34a26	Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha.	2018-08-24 09:15:04 +10:00
Nick Mathewson	2ae92ab973	Merge branch 'maint-0.3.4'	2018-08-23 14:26:04 -04:00
teor	fadcab920b	Bootstrap: check the exit policy and flag on descriptors Previously, Tor would only check the exit flag. In small networks, Tor could bootstrap once it received a consensus with exits, without fetching the new descriptors for those exits. After bootstrap, Tor delays descriptor fetches, leading to failures in fast networks like chutney. Fixes 27236; bugfix on 0.2.6.3-alpha.	2018-08-24 01:13:53 +10:00
teor	692efdad09	Update the message logged on relays when DirCache is disabled Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard flag. Fixes bug 24312; bugfix on 0.3.3.5-rc.	2018-08-23 19:13:25 +10:00
teor	da17875ea5	Travis: Don't do a distcheck with --disable-module-dirauth Part of 27252.	2018-08-23 18:20:39 +10:00
teor	e8dd83aecb	Merge branch 'ticket27252-033' into ticket27252-034 Semantic merge: - Rust offline and online were swapped in ticket27252-032	2018-08-23 18:20:17 +10:00
teor	ae2085dd7b	Merge branch 'ticket27252-032' into ticket27252-033 Semantic merge: - Rust offline and online were swapped in ticket27252-032 - TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2	2018-08-23 18:19:42 +10:00
teor	92f1a8af83	Travis: Skip offline rust builds for Linux gcc We already do an online rust build for Linux gcc. Part of 27252.	2018-08-23 18:18:14 +10:00
teor	b61d40c8a2	Travis: Only run one online rust build, to reduce network errors Part of 27252.	2018-08-23 18:17:03 +10:00
teor	99a2ecc795	Merge branch 'ticket27252-029' into ticket27252-032 This commit is already implemented in 0.3.2 and later: - Travis: Skip a duplicate hardening-off build in Tor 0.2.9	2018-08-23 18:15:55 +10:00
teor	7cea5a287f	Travis: Skip gcc on Linux with default settings It's redundant, because all the non-default builds use gcc on Linux. Part of 27252.	2018-08-23 18:13:53 +10:00
teor	7ec84cc094	Travis: Skip a duplicate hardening-off build in Tor 0.2.9 Part of 27252.	2018-08-23 17:08:28 +10:00
teor	8f89fb8f39	Travis: skip gcc on OSX, because the default compiler is clang Part of #27252.	2018-08-23 17:02:32 +10:00
Nick Mathewson	bf5704051c	Merge remote-tracking branch 'teor/travis-osx-master'	2018-08-21 20:04:13 -04:00
Nick Mathewson	aac1e17f22	Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4	2018-08-21 20:04:03 -04:00
Nick Mathewson	f0633bc491	Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3	2018-08-21 20:03:56 -04:00
Nick Mathewson	a29e9a901d	Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2	2018-08-21 20:03:41 -04:00
Nick Mathewson	05d62a3b73	Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9	2018-08-21 20:03:19 -04:00
Nick Mathewson	de66bd397c	Merge branch 'maint-0.3.4'	2018-08-21 19:20:37 -04:00
Nick Mathewson	f68aab83ba	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-21 19:20:31 -04:00
Nick Mathewson	245025a3df	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-21 19:16:40 -04:00
Nick Mathewson	d52f406001	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-21 19:16:40 -04:00
Nick Mathewson	ff0be08059	Fix a bug warning when sending an error on an HTTPTunnelPort conn Fixes bug 26470; bugfix on 0.3.2.1-alpha.	2018-08-21 10:12:04 -04:00
Nick Mathewson	df874ed0f1	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-21 10:01:41 -04:00
Nick Mathewson	9bc947dc18	Merge branch 'maint-0.3.4'	2018-08-21 10:01:41 -04:00
Nick Mathewson	4c0c4d4ade	Add changes file for 26873. I missed this when merging earlier.	2018-08-21 10:01:38 -04:00
Nick Mathewson	18183de060	Check for duplicate-close in connection_dir_finished_flusing() Fix for 26896.	2018-08-21 09:50:48 -04:00
Neel Chauhan	eb2b130ad9	If ExitRelay is not specified, emulate the behavior of "ExitRelay 0"	2018-08-20 20:25:23 -04:00
Nick Mathewson	85a8792344	Rewrite test_tortls_cert_matches_key() Unlike the old test, this test no will no longer mess around with the forbidden internals of any openssl data structures. Additionally, it verifies several other behaviors of tor_tls_cert_matches_key() that we had wanted to verify, such as the possibility of the certificate's key not matching. Fixes bug 27226; bugfix on 0.2.5.1-alpha.	2018-08-20 17:43:41 -04:00
rl1987	c6a154e7b8	Add changes file	2018-08-19 21:05:17 +03:00
cypherpunks	fecd583c0e	rust: abort on panic in all profiles Until https://github.com/rust-lang/rust/issues/52652 is fixed, unwinding on panic is potentially unsound in a mixed C/Rust codebase. The codebase is supposed to be panic-free already, but just to be safe. This started mattering at commit `d1820c1516`. Fixes #27199; bugfix on tor-0.3.3.1-alpha.	2018-08-18 19:23:28 +00:00
Nick Mathewson	700f5bcc43	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-17 09:38:26 -04:00
Nick Mathewson	e0b8c53f56	Merge branch 'maint-0.3.4'	2018-08-17 09:38:26 -04:00
Nick Mathewson	87aacbfbba	Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3	2018-08-17 09:38:08 -04:00
cypherpunks	7b7dd9ae1c	rust/protover: don't accept whitespace in ProtoSet::from_str() It's impossible for spaces to get here, since spaces are used as separators between individual protocol entries higher up. And it shouldn't ignore whitespace that isn't a literal space character, because that would differ from the C implementation. These were added in `9925d2e687`. Fixes #27177. Bugfix on 0.3.3.5-rc.	2018-08-17 13:34:03 +00:00
Nick Mathewson	ac721bd3b4	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-17 09:29:46 -04:00
Nick Mathewson	bedc0b0b8f	Merge branch 'maint-0.3.4'	2018-08-17 09:29:46 -04:00
cypherpunks	cc93f175ed	rust/protover: fix hyphen parsing bug in ProtoSet::from_str() It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen and everything after. Introduced in `d1820c1516`. Fixes #27164; bugfix on 0.3.3.1-alpha.	2018-08-17 13:27:24 +00:00
Neel Chauhan	64d9ea1413	In addrs_in_same_network_family(), choose IP subnet size based on IP type	2018-08-17 13:37:51 +10:00
Nick Mathewson	936e2aa0de	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-16 08:37:11 -04:00
Nick Mathewson	b49355915b	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-16 08:37:11 -04:00
Nick Mathewson	7e50d43f07	Merge branch 'maint-0.3.4'	2018-08-16 08:37:11 -04:00
George Kadianakis	c798957b59	Keep descriptor rotation time after HUP occurs.	2018-08-16 08:36:48 -04:00
Nick Mathewson	d029a5162d	Merge branch 'ticket27096'	2018-08-16 08:32:06 -04:00
rl1987	f454c28303	Fix test to pass without HOME env being set	2018-08-16 08:31:45 -04:00
Nick Mathewson	571cb2f662	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-15 12:20:57 -04:00
Nick Mathewson	0fc171a47b	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-15 12:20:57 -04:00
Nick Mathewson	34083f00ab	Merge branch 'maint-0.3.4'	2018-08-15 12:20:57 -04:00
Nick Mathewson	a26a2735b9	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-15 12:20:57 -04:00
Nick Mathewson	4c355ff185	Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9	2018-08-15 12:20:53 -04:00
Nick Mathewson	6c1d2549df	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-15 02:16:23 -04:00
Nick Mathewson	1868982de6	Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3	2018-08-15 02:16:19 -04:00
Nick Mathewson	b329cdf768	Merge remote-tracking branch 'public/bug26779_035'	2018-08-15 02:14:17 -04:00
Nick Mathewson	57d0b8c3cd	Merge remote-tracking branch 'tor-github/pr/206'	2018-08-11 10:14:29 -04:00
Nick Mathewson	c775689e96	Merge remote-tracking branch 'tor-github/pr/244'	2018-08-11 10:05:15 -04:00
Nick Mathewson	61d5bcc1a2	Merge remote-tracking branch 'tor-github/pr/268'	2018-08-11 10:04:04 -04:00
Nick Mathewson	b7ed61167f	Merge remote-tracking branch 'tor-github/pr/239'	2018-08-10 12:35:06 -04:00
teor	ed1210d0f1	Merge branch 'travis-osx-032' into travis-osx-033 Preserve 033 changes since 032.	2018-08-10 16:38:13 +10:00
teor	f5aa667d48	Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629.	2018-08-10 16:37:06 +10:00
teor	69adc68ac6	Merge branch 'travis-osx-029' into travis-osx-032 Simple merge to resolve order conflicts.	2018-08-10 16:31:35 +10:00
teor	ace98493bd	Merge branch 'travis-osx-034' into travis-osx-master Replace master .travis.yml with 034 .travis.yml. All the changes in master have been backported to the 034 .travis.yml already. Replace master src/test/test_rust.sh with 034 src/test/test_rust.sh, which was backported from master. One 033/034-specific commit needs to be reverted.	2018-08-10 13:28:19 +10:00
teor	6e0be81211	Merge branch 'travis-osx-033' into travis-osx-034 Replace 034 .travis.yml with 033 .travis.yml. Subsequent commits will restore 034 functionality. Replace 034 src/test/test_rust.sh with 033 src/test/test_rust.sh, which was backported from master.	2018-08-10 13:15:16 +10:00
teor	a5715a46c4	Changes file for Travis: enable macOS builds	2018-08-10 12:44:31 +10:00
teor	7ec75e014f	Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629.	2018-08-10 12:44:20 +10:00
teor	4cd3fcf248	Changes file for Travis: enable macOS builds	2018-08-10 12:10:56 +10:00
teor	229a75a49a	Rust: use a consistent working directory in builds and tests cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on 0.3.3.2-alpha.	2018-08-10 11:54:26 +10:00
teor	2b9dd0f9c0	Merge branch 'travis-osx-032' into travis-osx-033 Replace 033 .travis.yml with 032 .travis.yml. Subsequent commits will restore 033 functionality. src/rust/tor_util/include.am is deleted in 033. Subsequent commits will apply 032 changes to src/rust/tor_rust/include.am. Replace 033 src/test/test_rust.sh with 032 src/test/test_rust.sh, which was backported from master.	2018-08-10 11:43:17 +10:00
teor	4517c4c3e3	Changes file for Rust: backport src/test/test_rust.sh from master	2018-08-10 11:26:53 +10:00
teor	3b1c74baa5	Travis: Use cargo cache Closes ticket 26952.	2018-08-10 11:23:26 +10:00
teor	c9ad16ca2a	Fix $abs_top_srcdir in test_rust.sh Consistently use ../../.. as a fallback for $abs_top_srcdir in test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha.	2018-08-10 11:22:36 +10:00
teor	ce19477ffc	Stop setting $CARGO_HOME cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.	2018-08-10 11:14:32 +10:00
Nick Mathewson	5980cb8a19	Merge branch 'maint-0.3.4'	2018-08-09 08:47:26 -04:00
Nick Mathewson	b4362b99cf	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-09 08:47:25 -04:00
Nick Mathewson	fde551a387	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-09 08:47:25 -04:00
Nick Mathewson	8982719f6a	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-09 08:47:24 -04:00
teor	e4d7f2667c	Travis: add lzma and zstd, where available Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090.	2018-08-09 22:22:27 +10:00
teor	38cf52b023	Merge branch 'travis-osx-029' into travis-osx-032 Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality.	2018-08-09 22:20:29 +10:00
teor	23b242104b	Travis: run an asciidoc build Implements 27087.	2018-08-09 22:19:00 +10:00
teor	286a6bc3b8	Travis: Use ccache Part of ticket 26952.	2018-08-09 22:18:53 +10:00
teor	7cf7b52fca	Travis: create configure flags once, then echo the flags Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the flags helps developers work out what configure is doing. (Backported to 0.2.9 and later as a precaution.) Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.	2018-08-09 22:18:12 +10:00
Karsten Loesing	fe19b40fe9	Update geoip and geoip6 to the August 7 2018 database.	2018-08-09 09:44:38 +02:00
Taylor Yu	340da669be	Add more optional packages to Travis Apparently we weren't building with either libcap or libseccomp on Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes ticket 26560.	2018-08-09 16:51:42 +10:00
Nick Mathewson	159141a8c6	Merge branch 'ticket26947'	2018-08-08 18:07:32 -04:00
Nick Mathewson	0f0dac0bfc	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-08 18:06:15 -04:00
Nick Mathewson	da4f4cb269	Merge branch 'maint-0.3.4'	2018-08-08 18:06:15 -04:00
Nick Mathewson	c4d0d9bd24	Merge branch 'bug26948_033' into maint-0.3.3	2018-08-08 18:06:11 -04:00
Nick Mathewson	26f1167e71	Merge branch 'bug26779_033' into bug26779_035	2018-08-08 15:50:29 -04:00
Nick Mathewson	b66386865e	Detect broken stdatomic.h, and pretend that it isn't there at all I hope that the debian clang maintainers will look at debian bug 903709 soon. But until they do, this should keep our users and our CI happy on sid with clang. Closes ticket 26779.	2018-08-08 15:49:39 -04:00
rl1987	5f2e00241a	Add changes file	2018-08-08 19:07:50 +03:00
Nick Mathewson	7a570b8182	Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on `1790dc6760` in 0.1.0.1-rc.	2018-08-08 09:56:51 -04:00
Nick Mathewson	aaa5ca366e	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-08 09:26:23 -04:00
Nick Mathewson	7787150521	Merge branch 'maint-0.3.4'	2018-08-08 09:26:23 -04:00
Nick Mathewson	00536254b7	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-08 09:26:23 -04:00
Nick Mathewson	8e68fe7e1c	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-08 09:26:22 -04:00
Nick Mathewson	27a2a6cb9b	Changes file for 25440	2018-08-08 09:26:21 -04:00
Nick Mathewson	8410d3b0ad	These changes files are also merged in 0.3.4.6-rc: remove them.	2018-08-07 08:10:26 -04:00
Nick Mathewson	5e86a28683	Merge branch 'maint-0.3.4'	2018-08-07 08:05:56 -04:00
Nick Mathewson	882b2ad0aa	Merge branch 'bug27003_034_v2' into maint-0.3.4	2018-08-07 08:05:51 -04:00
Nick Mathewson	abf88af488	Merge branch 'maint-0.3.4'	2018-08-06 10:39:59 -04:00
Nick Mathewson	a54e94878a	Rename SEC identifier to BW_SEC in test_bwmgt.h Apparently Solaris 10 defines SEC somewhere in its headers, causing a compilation problem. Fixes bug 26994; bugfix on 0.3.4.1-alpha.	2018-08-06 10:39:14 -04:00
Nick Mathewson	2584604664	Remove changes files for items already merged into 0.3.4.6-rc	2018-08-06 08:35:41 -04:00
Nick Mathewson	5597ddc360	Mark openbsd-malloc as deprecated	2018-08-03 07:38:47 -04:00
Nick Mathewson	bb1f294232	Merge branch 'with_malloc_squashed'	2018-08-03 07:35:23 -04:00
Nick Mathewson	abde9fb426	Add a --with-malloc option. Based on a patch from Hello71 on ticket 20424. This patch additionally fixes openbsd-malloc support, switches our tcmalloc support to use pkgconfig, and tells the compiler to omit system malloc implementations as appropriate. squash! Add a --with-malloc option. Edit changelog file to fix a typo and credit Alex Xu in preferred format.	2018-08-03 07:34:40 -04:00
Nick Mathewson	be8e56c231	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-08-03 07:33:45 -04:00
Nick Mathewson	2a6c1585b0	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-03 07:33:45 -04:00
Nick Mathewson	4856a6e6c4	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-03 07:33:45 -04:00
Nick Mathewson	ae157b79e7	Merge branch 'maint-0.3.4'	2018-08-03 07:33:45 -04:00
Nick Mathewson	42c6ebda16	Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9	2018-08-03 07:33:39 -04:00
Nick Mathewson	176999fd95	When enabling periodic events, schedule but don't run them immediately. When we fixed 25939 in `f7633c1fca`, we introduced a call to rescan_periodic_events() from inside the onion service logic. But this meant that we could rescan the event list -- thereby running event callbacks! -- from inside the hidden service code. This could cause us to run some of our event callbacks from an inconsistent state, if we were in the middle of changing options. A related bug (#25761) prevented us from rescanning our periodic events as appropriate, but when we fixed THAT one, this bug reared its ugly head. The fix here is that "enabling" an event should cause us to run it from the event loop, but not immediately from the point where we enable it. Fixes bug 27003; bugfix on 0.3.4.1-alpha.	2018-08-02 10:14:56 -04:00
Nick Mathewson	820aba70ef	Changes file for owningcontrollerfd api	2018-08-01 11:09:15 -04:00
Nick Mathewson	fdaa483098	Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged	2018-07-31 19:56:23 -04:00
Nick Mathewson	e7a0616817	Changes files for feature26815 and 26816	2018-07-31 19:46:00 -04:00
Nick Mathewson	772106c6bc	Add a new function, tor_api_get_provider_version() Closes ticket 26947.	2018-07-31 09:18:54 -04:00
Nick Mathewson	7e4ac0283e	Merge remote-tracking branch 'teor/bug26986'	2018-07-31 08:50:38 -04:00
Nick Mathewson	a67d153cc7	Always call tor_free_all() when exiting tor_run_main() We would usually call it through tor_cleanup(), but in some code paths, we wouldn't. These paths would break restart-in-process, since leaving fields uncleared would cause assertion failures on restart. Fixes bug 26948; bugfix on 0.3.3.1-alpha	2018-07-31 08:45:17 -04:00
Nick Mathewson	01c73711f1	Merge branch 'maint-0.3.4'	2018-07-31 08:30:58 -04:00

... 17 18 19 20 21 ...

8774 Commits