8169 Commits

Author	SHA1	Message	Date
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
Nick Mathewson	bcce3e7e0b	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-31 08:30:01 -04:00
Nick Mathewson	373b23a9ee	Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3	2018-07-31 08:29:54 -04:00
Nick Mathewson	d66cfadbd3	Merge remote-tracking branch 'teor/bug26979'	2018-07-31 08:26:15 -04:00
Nick Mathewson	de4d7c3837	Merge branch 'ticket26447'	2018-07-31 08:21:10 -04:00
teor	fcc8480093	Appveyor CI: Changes file for 26979 ... Closes 26979.	2018-07-31 11:58:04 +10:00
teor	9118430b14	Use Windows-compatible format strings in tor-print-ed-signing-cert.c ... Fixes bug 26986; bugfix on master.	2018-07-31 11:21:28 +10:00
Nick Mathewson	21babc8d3f	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-30 09:01:59 -04:00
Nick Mathewson	3a6bd21440	Merge remote-tracking branch 'teor/bug26627_033_merged_master'	2018-07-30 09:01:55 -04:00
Nick Mathewson	4f854dbdc2	Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3	2018-07-30 09:01:45 -04:00
Nick Mathewson	ff593ae878	Merge remote-tracking branch 'rl1987/feature19506_3'	2018-07-30 08:55:57 -04:00
Nick Mathewson	13393b2d91	Merge remote-tracking branch 'rl1987/ticket21349_4'	2018-07-30 08:49:49 -04:00
Nick Mathewson	7d66ec0feb	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-30 08:45:01 -04:00
Nick Mathewson	a159eaf45f	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-30 08:45:01 -04:00
Nick Mathewson	ec1ced3cc1	Merge remote-tracking branch 'teor/bug26924'	2018-07-30 08:44:58 -04:00
Nick Mathewson	fea35ddf00	Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2	2018-07-30 08:44:40 -04:00
Nick Mathewson	ac9d08f66a	Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'	2018-07-30 08:33:59 -04:00
Nick Mathewson	811ed8cf9f	Merge remote-tracking branch 'rl1987/bug26892_take2'	2018-07-30 08:24:14 -04:00
Nick Mathewson	d102e9c2e4	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-30 08:17:25 -04:00
Nick Mathewson	5823e62fa2	Merge branch 'maint-0.3.4'	2018-07-30 08:17:25 -04:00
Nick Mathewson	15d7f24c57	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-30 08:17:24 -04:00
Taylor Yu	a8bdb851eb	Don't disable an unsupported compiler warning ... Conditionalize the pragma that temporarily disables -Wunused-const-variable. Some versions of gcc don't support it. We need to do this because of an apparent bug in some libzstd headers. Fixes bug 26785; bugfix on 0.3.2.11.	2018-07-26 12:32:34 -05:00
rl1987	ffdfd39d4f	Early bailout from log_addr_has_changed() if running as client	2018-07-26 17:49:27 +03:00
teor	d01602bebb	Merge branch 'bug26924_032' into bug26924 ... Update rendcommon.h include path.	2018-07-25 14:50:45 +10:00
teor	859d5a7375	Improve connection auth logging ... Improve the log message when connection initiators fail to authenticate direct connections to relays. Fixes bug 26927; bugfix on 0.3.0.1-alpha.	2018-07-25 14:39:31 +10:00
teor	fdc3ad6259	Merge branch 'bug26924_029' into bug26924_032	2018-07-25 14:33:10 +10:00
teor	6443812e34	Stop logging link auth warnings on Single Onion Services and Tor2web ... Instead, log a protocol warning when single onion services or Tor2web clients fail to authenticate direct connections to relays. Fixes bug 26924; bugfix on 0.2.9.1-alpha.	2018-07-25 14:30:33 +10:00
teor	fc4d08e260	Merge branch 'bug26627_033' into bug26627_033_merged_master	2018-07-25 09:17:17 +10:00
teor	3821081a55	Stop putting unsupported ed25519 link auth in v3 onion service descs ... Stop putting ed25519 link specifiers in v3 onion service descriptors, when the intro point doesn't support ed25519 link authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha.	2018-07-25 09:16:15 +10:00
teor	a99920c7d4	Stop sending unsupported ed25519 link specifiers in v3 introduce cells ... Stop sending ed25519 link specifiers in v3 onion service introduce cells, when the rendezvous point doesn't support ed25519 link authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha.	2018-07-25 09:16:04 +10:00
juga0	6d59ab16a0	Add changes file regarding bandwidth file headers	2018-07-23 00:58:31 +00:00
rl1987	e9f6f742b2	Add changes file	2018-07-21 18:38:33 +03:00
Neel Chauhan	7651518b6d	Add changes file for Bug #20874	2018-07-20 21:39:09 -04:00
rl1987	dddc9a1715	Add changes file	2018-07-20 21:42:45 +03:00
Nick Mathewson	977821e59f	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-20 10:42:29 -04:00
Nick Mathewson	dbf57ecf39	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-20 10:42:29 -04:00
Nick Mathewson	583df33e20	Merge branch 'maint-0.3.4'	2018-07-20 10:42:29 -04:00
Nick Mathewson	be3a962ca7	Merge branch 'ticket26647_032' into maint-0.3.2	2018-07-20 10:42:23 -04:00
teor	022b8f15da	Ignore mach_approximate_time when targeting macOS 10.9 and earlier ... Work around two different bugs in the OS X 10.10 and later SDKs that would prevent us from successfully targeting earlier versions of OS X. Fixes bug 26876; bugfix on 0.3.3.1-alpha.	2018-07-20 12:29:32 +10:00
Nick Mathewson	b44fce6716	Merge branch 'maint-0.3.4'	2018-07-19 08:32:00 -04:00
Nick Mathewson	0a60a94a55	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-19 08:31:07 -04:00
Nick Mathewson	27f5bd52fe	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-19 08:31:07 -04:00
Nick Mathewson	209332e71a	Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2	2018-07-19 08:30:59 -04:00
Nick Mathewson	e0f99404f5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-18 16:39:25 -04:00
Nick Mathewson	d5dd500e36	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-18 16:39:25 -04:00
Nick Mathewson	312a42fc85	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-18 16:39:25 -04:00
Nick Mathewson	64af15d373	Merge branch 'maint-0.3.4'	2018-07-18 16:39:25 -04:00
Nick Mathewson	93da2cae49	Changes file for bug 26787	2018-07-18 16:39:22 -04:00
Nick Mathewson	61e080e24a	Merge branch 'maint-0.3.4'	2018-07-18 15:09:28 -04:00
Nick Mathewson	a7bd20ebaf	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-18 15:08:57 -04:00
Nick Mathewson	c31700d664	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-18 15:04:14 -04:00
Nick Mathewson	559f79fd79	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-18 15:03:27 -04:00
Nick Mathewson	a321d72401	Merge branch 'bug26485_029_squashed' into maint-0.2.9	2018-07-18 15:01:03 -04:00
Nick Mathewson	dcee4d4c9c	Warn the directory authority operator if their versions list is bogus ... Prevents bug 26485; bugfix on 0.1.1.6-alpha.	2018-07-18 15:00:53 -04:00
teor	449d190e2e	SKIP test_key_expiration.sh on Windows until the underlying issue is resolved ... Skip an unreliable key expiration test on Windows, until the underlying issue in bug 26076 is resolved. Fixes bug 26853; bugfix on 0.3.2.1-alpha.	2018-07-18 12:37:12 +10:00
Nick Mathewson	e2b744ce38	Merge branch 'bug25552_ope_squashed'	2018-07-17 16:19:32 -04:00
George Kadianakis	f00b7a7faa	Add changes file.	2018-07-17 15:57:46 -04:00
Nick Mathewson	304ee896d1	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-17 14:56:52 -04:00
Nick Mathewson	28d1057d56	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-17 14:56:52 -04:00
Nick Mathewson	61a2762e35	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-17 14:56:52 -04:00
Nick Mathewson	12afdcc15a	Merge branch 'maint-0.3.4'	2018-07-17 14:56:52 -04:00
teor	6dafddd05d	SKIP test_keygen.sh on Windows until the underlying issue is resolved ... Skip an unreliable key generation test on Windows, until the underlying issue in bug 26076 is resolved. Fixes bug 26830; bugfix on 0.2.7.3-rc.	2018-07-17 14:56:18 -04:00
Nick Mathewson	4833717d69	Merge branch 'maint-0.3.4'	2018-07-17 14:46:16 -04:00
Nick Mathewson	c7dcf252fd	Merge remote-tracking branch 'ahf-github/bugs/26437'	2018-07-17 14:33:31 -04:00
Neel Chauhan	7c052d4ac3	Add changes file for Bug #18642	2018-07-17 09:19:27 -04:00
rl1987	8645647250	Fix build to work with --disable-unittests again	2018-07-17 12:09:34 +00:00
David Goulet	5aaea38d88	Merge remote-tracking branch 'pastly/issue26703'	2018-07-16 14:44:45 -04:00
Nick Mathewson	ef234ba303	Merge branch 'socks_trunnel4_squashed_merged'	2018-07-15 17:07:20 -04:00
Nick Mathewson	f608cc0f31	Merge remote-tracking branch 'tor-github/pr/179'	2018-07-13 18:30:17 -04:00
Taylor Yu	7585523cfc	Add changes file for ticket 26492	2018-07-13 12:34:23 -05:00
Alexander Færøy	46501cdd18	Fix forking tests on Windows when there is a space in the path. ... See: https://bugs.torproject.org/26437	2018-07-13 12:46:18 +02:00
Nick Mathewson	710188f84e	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-12 14:32:16 -04:00
Nick Mathewson	98ee23ca1e	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-12 14:32:16 -04:00
Nick Mathewson	e0f33c1d3e	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-12 14:32:16 -04:00
Nick Mathewson	b6c50c6259	Merge branch 'maint-0.3.4'	2018-07-12 14:32:16 -04:00
Roger Dingledine	cd4795ca3e	put new bridge auth Serge into place ... The "Bifroest" bridge authority has been retired; the new bridge authority is "Serge", and it is operated by George from the TorBSD project. Closes ticket 26771.	2018-07-12 14:12:13 -04:00
Nick Mathewson	7556933537	Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged	2018-07-12 11:47:25 -04:00
rl1987	2f284d3325	Add changes file	2018-07-12 11:41:44 -04:00
Nick Mathewson	23cb9a046c	Tweak changes/bug26502 ... (When the ticket isn't a bugfix, we don't say "fixes bug XYZ". When we do, then the version in "bugfix on XXX" is supposed to be the first version that had the bug.)	2018-07-12 09:31:07 -04:00
Nick Mathewson	413b73450c	Merge remote-tracking branch 'imnotbad/bug26502'	2018-07-12 09:30:01 -04:00
Nick Mathewson	28db2c9291	Tweak changes file for 26663	2018-07-12 09:00:14 -04:00
Nick Mathewson	a7ec493d88	Merge remote-tracking branch 'imnotbad/bug26663'	2018-07-12 08:59:23 -04:00
Nick Mathewson	16bdbddc2c	When setting a nonstandard malloc, disable the system malloc. ... Closes ticket 20424.	2018-07-11 09:37:29 -04:00
Nick Mathewson	537092cdbb	Merge branch 'ticket26223'	2018-07-10 20:18:28 -04:00
Nick Mathewson	9ec80909ec	Add a changes file for 26481 (the big code movement)	2018-07-10 15:07:04 -04:00
Nick Mathewson	3df548212a	Remove changes file for 26715. ... (Bugfixes on bugs that have never been in a released version don't need a changes file.)	2018-07-10 14:51:13 -04:00
Nick Mathewson	6711a172c0	Merge remote-tracking branch 'neel/fbsd-cfix'	2018-07-10 14:50:49 -04:00
Nick Mathewson	8de48c111c	Remove addr_port_lookup. ... This lets us cut the dependency from address.c to resolve.c: the address.c module now has no paths to the libc resolver in it.	2018-07-10 13:32:37 -04:00
Nick Mathewson	2f657a1416	Remove all users of addr_port_lookup outside of address.c ... This function has a nasty API, since whether or not it invokes the resolver depends on whether one of its arguments is NULL. That's a good way for accidents to happen. This patch incidentally makes tor-resolve support socks hosts on IPv6.	2018-07-10 13:23:37 -04:00
Neel Chauhan	6d58c20d94	Fix build on FreeBSD post-refactor	2018-07-10 12:32:14 -04:00
Nick Mathewson	e3e6335a08	Add controller support for listing ExtORPort and HTTPTunnelPorts ... Closes ticket 26647.	2018-07-10 10:50:43 -04:00
Nick Mathewson	951d59d706	Use tor_getline() in dirserv.c to remove its upper line limit. ... Closes ticket 26223.	2018-07-10 10:36:49 -04:00
Nick Mathewson	cade65fd2e	Add "check-includes" to check-local.	2018-07-09 15:55:03 -04:00
Matt Traudt	d20feddfcc	Lower log level of "Scheduler of type KIST has been enabled" to INFO	2018-07-09 10:48:43 -04:00
Nick Mathewson	cec8d4aa92	Remove changes files for items that will appear in 0.3.4.4-rc	2018-07-09 10:30:12 -04:00
Nick Mathewson	e7463be39b	Merge branch 'maint-0.3.4'	2018-07-09 10:16:51 -04:00
Nick Mathewson	83de46eb25	Changes file and comment for 25928.	2018-07-09 10:16:48 -04:00
Nick Mathewson	529faef28e	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-09 10:15:16 -04:00
Nick Mathewson	69918629f5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-09 10:14:43 -04:00
Nick Mathewson	4a604d9938	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-09 10:14:43 -04:00
Nick Mathewson	8b53dfc362	Merge branch 'bug26269_029' into maint-0.2.9	2018-07-09 10:14:39 -04:00
Nick Mathewson	4ff93dd94f	Merge remote-tracking branch 'rl1987/doc26638'	2018-07-09 09:40:04 -04:00
Nick Mathewson	a1a55a33c2	Merge branch 'bug26488'	2018-07-09 09:37:14 -04:00
rl1987	46998fc8fd	Validate that DirAuthority address is IPv4	2018-07-09 09:37:09 -04:00
Nick Mathewson	03283c00d8	Merge remote-tracking branch 'rl1987/bug26525'	2018-07-09 09:31:12 -04:00
Nick Mathewson	a95cfb8a58	Clear all control.c flags on control_free_all() ... Fixes bug 25512. (Cherry-picked from 3519d0c808	2018-07-09 09:20:45 -04:00
Nick Mathewson	75f7064a13	Merge branch 'maint-0.3.4'	2018-07-09 09:11:42 -04:00
Nick Mathewson	d3894dc34b	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-09 09:11:41 -04:00
Nick Mathewson	1af69c1812	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-09 09:11:41 -04:00
Nick Mathewson	451a84cecb	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-09 09:11:41 -04:00
Nick Mathewson	fead22fb2a	Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3	2018-07-09 09:08:58 -04:00
rl1987	0bd2f2edd9	Add changes file	2018-07-08 15:13:33 +02:00
Kaidan	5f09708046	#26502: Stop using fallback blacklist	2018-07-08 06:54:14 +10:00
Kaidan	abeb07a1bf	Made 'auto' keyword in torrc case insensitive	2018-07-08 00:15:16 +10:00
Karsten Loesing	9faa28b60e	Update geoip and geoip6 to the July 3 2018 database.	2018-07-06 20:54:03 +02:00
rl1987	287b64ee10	Add CODE_OF_CONDUCT file	2018-07-05 11:22:33 +03:00
Nick Mathewson	2878dad9db	Merge branch 'maint-0.3.4'	2018-07-03 13:31:26 -04:00
Nick Mathewson	32d9d69350	Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4	2018-07-03 13:16:37 -04:00
Nick Mathewson	df98582851	Merge remote-tracking branch 'github/ticket26626'	2018-07-03 12:52:43 -04:00
Nick Mathewson	fe8f774820	Merge branch 'bug26522'	2018-07-03 11:34:36 -04:00
rl1987	d0525c38d6	Refrain from potentially insecure usage of strncat()	2018-07-03 11:34:14 -04:00
Nick Mathewson	e2a94dc481	Require stdint.h and inttypes.h ... We've been silently requiring stdint.h for a while now, and nobody has complained. Closes ticket 26626.	2018-07-03 10:25:31 -04:00
Nick Mathewson	a01b4d7f87	Merge remote-tracking branch 'rl1987/ticket26527'	2018-07-03 09:53:46 -04:00
Nick Mathewson	a4e8f94507	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-03 09:48:03 -04:00
Nick Mathewson	4c094436c5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-07-03 09:48:03 -04:00
Nick Mathewson	d38e474950	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-03 09:48:03 -04:00
Nick Mathewson	228d25ddf6	Merge branch 'maint-0.3.4'	2018-07-03 09:48:03 -04:00
rl1987	5028a52b54	Remove old instructions from INSTALL	2018-07-03 16:34:52 +03:00
rl1987	439b528f25	Rename sandbox_getaddrinfo() et. al.	2018-07-03 15:53:39 +03:00
rl1987	fedb3e46ec	Remove ATTR_NONNULL macro	2018-07-03 12:33:09 +03:00
Nick Mathewson	dfdf32404c	Partially revert "Use tor_addr_from_getsockname() in several places" ... This reverts part of commit 6ed384b827, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha.	2018-07-02 16:11:02 -04:00
Nick Mathewson	3baf3d01cb	hs_ntor_ref.py: pass only strings to subprocess.Popen ... Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.	2018-07-02 14:23:26 -04:00
Nick Mathewson	fc5f8b6931	ntor_ref.py: pass only strings to subprocess.Popen ... Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug introduced in f4be34f70d, which was apparently intended itself as a Python3 workaround.	2018-07-02 14:18:41 -04:00
Nick Mathewson	bfcfeaed07	Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4	2018-07-02 13:22:07 -04:00
Nick Mathewson	d6aa6549b5	Merge remote-tracking branch 'catalyst-github/moar-libs'	2018-07-02 12:22:37 -04:00
Nick Mathewson	cf8c3abff1	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-07-01 10:22:21 -04:00
Nick Mathewson	adcd1d8b9a	Merge branch 'maint-0.3.4'	2018-07-01 10:22:21 -04:00
Nick Mathewson	9aeef05f8f	Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3	2018-07-01 10:22:18 -04:00
Nick Mathewson	028523c801	Merge branch 'maint-0.3.4'	2018-06-30 09:15:39 -04:00
Nick Mathewson	e042727cf0	Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4	2018-06-30 09:15:34 -04:00
Nick Mathewson	7a47379f25	Merge branch 'maint-0.3.4'	2018-06-29 13:06:16 -04:00
Nick Mathewson	f82f8179e6	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-29 13:06:15 -04:00
Nick Mathewson	f6b30a97a9	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-06-29 13:06:15 -04:00
Nick Mathewson	68dfbd5ef4	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-29 13:06:15 -04:00
Nick Mathewson	ea14d3408d	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-06-29 13:06:15 -04:00
Nick Mathewson	890bc15ab6	Changes file for 26467	2018-06-29 13:04:29 -04:00
Taylor Yu	f028713d37	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-06-28 17:25:43 -05:00
Alex Xu (Hello71)	614a78ddaa	Fix Rust cross compilation.	2018-06-27 14:42:06 -05:00
Nick Mathewson	b9b05e437d	Merge branch 'net_refactor'	2018-06-27 12:52:31 -04:00
David Goulet	3f8a12a63a	control: Make HSPOST properly parse HSADDRESS= param ... For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now correctly use it and furthermore sends back a "200 OK" in case the command is successful for a v3 descriptor. Fixes #26523 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-06-27 12:25:24 -04:00
Nick Mathewson	0742b38725	Revert "Use the "commands" argument of AC_CONFIG_FILES to make scripts +x" ... This reverts commit 56c1fbf33f.	2018-06-27 09:53:46 -04:00
Nick Mathewson	3930416dec	Link GetAdaptersAddresses, rather than loading it on-demand. ... This function has been present since Windows XP.	2018-06-27 09:12:57 -04:00
Nick Mathewson	5f41bc91c6	Merge branch 'ticket26439'	2018-06-26 17:02:06 -04:00
Nick Mathewson	bf89278c79	Refactor bloom filter logic not to be digest-specific. ... Now the address-set code and the digest-set code share the same backend. Closes ticket 26510	2018-06-26 13:27:23 -04:00
Nick Mathewson	c08102ea77	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-06-26 09:21:59 -04:00
Nick Mathewson	f8dad5a079	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-26 09:21:59 -04:00
Nick Mathewson	25226fb260	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-26 09:21:59 -04:00
Nick Mathewson	d6d3f8486d	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-06-26 09:21:59 -04:00
Nick Mathewson	b4e23dba93	Merge branch 'maint-0.3.4'	2018-06-26 09:21:59 -04:00
Nick Mathewson	56c1fbf33f	Use the "commands" argument of AC_CONFIG_FILES to make scripts +x ... Closes ticket 26439.	2018-06-21 14:26:47 -04:00
Nick Mathewson	47ee7978fe	Prefer recent Python 3 in autoconf. ... Closes ticket 26372.	2018-06-21 09:31:01 -04:00
Nick Mathewson	2ad062ee60	Merge branch 'mikeperry_bug26214-rebased_squashed'	2018-06-21 09:20:03 -04:00
Mike Perry	11d9938694	Bug 26214: Changes file.	2018-06-21 09:18:51 -04:00
Nick Mathewson	c42071f750	Merge branch 'maint-0.3.4'	2018-06-21 08:59:58 -04:00
Nick Mathewson	e845bd17f8	Merge branch 'bug25787_squashed' into maint-0.3.4	2018-06-21 08:56:27 -04:00
Nick Mathewson	cacf326e78	Revise geoip tests to not require paths of actual geoip config ... When I wrote the first one of these, it needed the path of the geoip file. But that doesn't translate well in at least two cases: - Mingw, where the compile-time path is /c/foo/bar and the run-time path is c:\foo\bar. - Various CI weirdnesses, where we cross-compile a test binary, then copy it into limbo and expect it to work. Together, these problems precluded these tests running on windows. So, instead let's just generate some minimal files ourselves, and test against them. Fixes bug 25787	2018-06-21 08:56:20 -04:00
Nick Mathewson	349f95017c	Merge branch 'maint-0.3.4'	2018-06-21 08:54:02 -04:00
Nick Mathewson	97925322a1	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-06-21 08:54:02 -04:00
Nick Mathewson	27e456cd72	Merge remote-tracking branch 'rl1987/ticket19979_2'	2018-06-21 08:53:48 -04:00
Nick Mathewson	8b108935b2	Fix changes file for memory leak.	2018-06-21 08:53:37 -04:00
Nick Mathewson	683776bfab	Merge branch 'maint-0.3.4'	2018-06-21 08:36:48 -04:00
Nick Mathewson	c389c41292	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-06-21 08:36:48 -04:00
Roger Dingledine	7b1a3c5164	fix memory leak in protover.c ... Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting. This bug was taking down directory authorities in the live network due to out-of-memory issues. Fixes bug 26435; bugfix on 0.3.3.6.	2018-06-20 19:43:58 -04:00
Nick Mathewson	50fb8301c1	Changes file for logging circularity fixes.	2018-06-20 16:16:45 -04:00
Nick Mathewson	9fa73003fc	Remove dmalloc support; closes #26426 ... Dmalloc hasn't seen a release in over a decade, and there are much better tools to use these days.	2018-06-20 10:21:34 -04:00
Nick Mathewson	e4e949e901	fix a changes file warning	2018-06-20 10:20:44 -04:00
Nick Mathewson	8846f128ff	Changes file for full_include_paths	2018-06-20 09:36:28 -04:00
Nick Mathewson	d7301a456a	Merge remote-tracking branch 'neel/b25886c'	2018-06-20 08:32:34 -04:00
Nick Mathewson	e9c93a3415	Merge branch 'maint-0.3.4'	2018-06-20 08:29:52 -04:00
Nick Mathewson	0a6f4627a4	eol@eof in test-dir.c	2018-06-20 08:29:38 -04:00
Nick Mathewson	11a76b903b	Merge branch 'maint-0.3.4'	2018-06-20 08:05:07 -04:00
Nick Mathewson	7b9cd5cca5	Merge branch 'asn_bug24977_final_squashed' into maint-0.3.4	2018-06-20 08:02:27 -04:00
George Kadianakis	1f1a57b8d0	Add changes file for #24977.	2018-06-20 08:01:02 -04:00
Nick Mathewson	5acbcf150e	Merge branch 'maint-0.3.4'	2018-06-20 07:53:22 -04:00
rl1987	ce9b9cc18d	Add changes file	2018-06-20 07:49:41 -04:00
Nick Mathewson	152e4a1e50	Merge branch 'maint-0.3.4'	2018-06-20 07:35:17 -04:00
Taylor Yu	bfd36177c4	Fix compilation of Rust crypto doctests ... The doctests for src/rust/crypto don't compile for multiple reasons, including some missing exports and incorrect identifier paths. Fixes bug 26415; bugfix on 0.3.4.1-alpha.	2018-06-19 13:53:26 -05:00
rl1987	5af29fbb63	When possible, use RFC5869 HKDF implementation from OpenSSL ... Also, stop supporting empty HKDF input key material	2018-06-19 19:26:31 +03:00
Nick Mathewson	f3267741e4	Merge branch 'maint-0.3.4'	2018-06-18 17:09:03 -04:00
Nick Mathewson	d27745d81d	Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a ... This was already added to LIBTOR_A_SOURCES; it doesn't need to get added again. Fixes bug 26402. Bugfix on 0.3.4.1-alpha.	2018-06-18 17:07:27 -04:00
Nick Mathewson	5879909826	Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a" ... This reverts commit 70d91bd059.	2018-06-18 17:06:18 -04:00
Nick Mathewson	70d91bd059	Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a ... This was already added to LIBTOR_A_SOURCES; it doesn't need to get added again. Fixes bug 26402. Bugfix on 0.3.4.1-alpha.	2018-06-18 17:03:52 -04:00
Nick Mathewson	104c2e9e7e	Merge branch 'split_or_h'	2018-06-18 14:18:34 -04:00
Nick Mathewson	ac64e00794	Changes file for "make clippy"	2018-06-18 11:30:06 -04:00
Nick Mathewson	16dd2f7bb0	Merge remote-tracking branch 'rl1987/bug25477'	2018-06-17 20:25:40 -04:00
Nick Mathewson	5746e210b8	Merge remote-tracking branch 'rl1987/feature8323_squashed2'	2018-06-17 20:20:15 -04:00
Nick Mathewson	d5e4b6983f	Merge remote-tracking branch 'rl1987/bug26282'	2018-06-17 19:32:08 -04:00
Nick Mathewson	987174cc6f	Merge remote-tracking branch 'github/bug26152_035'	2018-06-17 19:28:59 -04:00
Neel Chauhan	9d7f148885	Make frac_nodes_with_descriptors() take and use for_direct_connect	2018-06-16 11:27:28 -04:00
Nick Mathewson	3dd94a7ea7	Changes file for rust fatal warnings	2018-06-16 10:20:21 -04:00
Nick Mathewson	3edc48c07b	Add a changes file for splitting structures out of or.h	2018-06-15 15:48:03 -04:00
Nick Mathewson	945d871da5	Merge branch 'maint-0.3.3'	2018-06-14 12:50:26 -04:00
Nick Mathewson	71065201dd	Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3	2018-06-14 12:47:09 -04:00
Nick Mathewson	015fcd0e11	Fix a GCC "potential null dereference" warning. ... Fixes bug 26269; bugfix on c30be5a82d in 0.2.8.2-alpha	2018-06-13 10:34:53 -04:00
Nick Mathewson	7e7585d0a1	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-13 09:59:28 -04:00
Nick Mathewson	ca6d289c00	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-13 09:59:28 -04:00
Nick Mathewson	7cc3cdef22	Merge branch 'maint-0.3.3'	2018-06-13 09:59:28 -04:00
Nick Mathewson	9713ecfc40	Fix an extra space in a changes file	2018-06-13 09:59:26 -04:00
Nick Mathewson	049ba66746	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-13 09:58:05 -04:00
Nick Mathewson	286d02995f	Merge branch 'maint-0.3.3'	2018-06-13 09:58:05 -04:00
Nick Mathewson	6017447e3a	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-13 09:58:04 -04:00
Nick Mathewson	94f3007627	Merge branch 'bug26158_031' into maint-0.3.1	2018-06-13 09:58:01 -04:00
Nick Mathewson	1c80eb92fa	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-13 09:57:10 -04:00
Nick Mathewson	76e9de7c6d	Merge branch 'maint-0.3.3'	2018-06-13 09:57:10 -04:00
Nick Mathewson	ff70cc84f8	Merge branch 'bug25686_diagnostic_032' into maint-0.3.2	2018-06-13 09:56:17 -04:00
Nick Mathewson	8c8ed91aae	Merge remote-tracking branch 'rl1987/bug24891'	2018-06-13 09:46:50 -04:00
Nick Mathewson	bc951e83aa	Fold in changelog entry.	2018-06-12 09:47:07 -04:00
Nick Mathewson	16381b579e	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-06-12 09:44:17 -04:00
Nick Mathewson	53513e4bfe	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-12 09:44:17 -04:00
Nick Mathewson	eaa359650c	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-12 09:44:17 -04:00
Nick Mathewson	03f3ee6d74	Merge branch 'maint-0.3.3'	2018-06-12 09:44:17 -04:00
Linus Nordberg	2ef448da2f	Add a changelog entry.	2018-06-12 09:44:01 -04:00
Nick Mathewson	73aae608d5	Remove folded-in changes files	2018-06-12 08:56:28 -04:00
Nick Mathewson	6230dfaf14	Merge branch 'maint-0.3.3'	2018-06-12 08:18:57 -04:00
Nick Mathewson	5d8a927aa3	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-12 08:18:56 -04:00
Nick Mathewson	7fff99110b	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-12 08:18:56 -04:00
Nick Mathewson	d84581a3e6	Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1	2018-06-12 08:18:53 -04:00
Nick Mathewson	f4e51990b9	Merge remote-tracking branch 'rl1987/bug26283'	2018-06-12 08:17:48 -04:00
Nick Mathewson	74ac463e7f	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-12 08:11:20 -04:00
Nick Mathewson	6dca180ae9	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-12 08:11:20 -04:00
Nick Mathewson	b2470f5140	Merge branch 'maint-0.3.3'	2018-06-12 08:11:20 -04:00
Nick Mathewson	19f3868523	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-06-12 08:11:19 -04:00
Nick Mathewson	8be3513743	start the 0.3.4.2-alpha changelog	2018-06-11 16:37:08 -04:00
Nick Mathewson	faf4580061	Several attempts to diagnose ticket 25686 ... There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running an old version of our software, before 0.3.2.stable. 2. They are not running our software, but they are claiming they are. 3. They are uploading through a proxy that strips X-Desc-Gen-Reason. 4. They somehow had a bug in their software. According to the 25686 data, 1 is the most common reason. This ticket is an attempt to diagnose case 4, or prove that case 4 doesn't actually happen.	2018-06-11 16:24:00 -04:00
Karsten Loesing	ae540569ce	Update geoip and geoip6 to the June 7 2018 database.	2018-06-11 21:58:55 +02:00
Nick Mathewson	f399887cfe	Merge remote-tracking branch 'mikeperry-github/bug26259'	2018-06-08 10:17:00 -04:00
Nick Mathewson	a141127435	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-08 10:12:57 -04:00
Nick Mathewson	dd63033fcb	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-06-08 10:11:57 -04:00
Nick Mathewson	1ef8023e00	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-06-08 10:11:57 -04:00
Nick Mathewson	aef0607f38	Merge branch 'maint-0.3.3'	2018-06-08 10:11:57 -04:00
Nick Mathewson	c27bb4072c	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-06-08 10:11:57 -04:00
rl1987	719b5c1d27	Avoid out-of-bounds smartlist access in protover_compute_vote() ... and contract_protocol_list()	2018-06-08 10:11:32 -04:00
rl1987	25341245ae	Implement GETINFO md/all	2018-06-08 13:25:25 +03:00
rl1987	39bbb8d9cf	Avoid casting smartlist index implicitly	2018-06-04 11:56:37 +03:00
rl1987	9876575d2c	Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)	2018-06-03 16:45:09 +03:00
teor	8366be3b51	Silence unused-const-variable warnings in zstd.h on some gcc versions ... Fixes bug 26272; bugfix on 0.3.1.1-alpha.	2018-06-02 14:11:04 -07:00
Nick Mathewson	3716ddf1b4	Merge remote-tracking branch 'rl1987/doc25237'	2018-06-02 11:35:06 -07:00
Nick Mathewson	9f884a38e3	Merge branch 'maint-0.3.3'	2018-06-02 10:36:49 -07:00
Nick Mathewson	f15f90e2ca	Merge branch 'bug26121-033-squashed' into maint-0.3.3	2018-06-02 10:36:44 -07:00
Mike Perry	fe5764012a	Bug 26121: Improve BUILDTIMEOUT_SET accuracy. ... We were miscounting the total number of circuits for the TIMEOUT_RATE and CLOSE_RATE fields of this event.	2018-06-02 10:36:36 -07:00
Nick Mathewson	00e150a0e4	Merge branch 'bug25939_034_01_squashed'	2018-06-02 10:33:33 -07:00
David Goulet	66e76066e0	hs-v3: Build onion address before registering ephemeral service ... With the work on #25500 (reducing CPU client usage), the HS service main loop callback is enabled as soon as the HS service map changes which happens when registering a new service. Unfortunately, for an ephemeral service, we were building the onion address *after* the registration leading to the "service->onion_address` to be an empty string. This broke the "HS_DESC CREATED" event which had no onion address in it. And also, we were logging an empty onion address for that service. Fixes #25939 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-06-02 10:33:20 -07:00
rl1987	b7fae0f48c	Heed --disable-unittests properly	2018-06-02 12:53:04 +03:00
rl1987	f8d549db7b	Point reader to a section in tor-spec.txt	2018-06-02 11:15:10 +03:00
Mike Perry	2b734944af	Bug 26259: Changes file.	2018-06-01 00:24:00 +00:00
Nick Mathewson	9d06c41c6e	Make sure that the test_rust.sh script fails when a test fails ... Exit codes from find(1) seem not to be so reliable as we had hoped. Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560	2018-05-31 17:15:57 -07:00
rl1987	eb7a3fae08	Refrain from mentioning old bug in a warning	2018-05-30 19:44:20 +02:00
Nick Mathewson	fa1890e97f	Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3	2018-05-27 10:03:11 -04:00
Nick Mathewson	3f3739c6e0	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-05-24 09:40:06 -04:00
Nick Mathewson	f48fb8a720	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-05-24 09:40:06 -04:00
Nick Mathewson	f42739e746	Merge branch 'maint-0.3.3'	2018-05-24 09:40:06 -04:00
Nick Mathewson	c000763f1e	Merge branch 'bug26116_033' into maint-0.3.3	2018-05-24 09:40:00 -04:00
Nick Mathewson	c380562aed	Merge branch 'bug26116_029' into maint-0.2.9	2018-05-24 09:39:46 -04:00
Nick Mathewson	7fb941e9f2	Merge branch 'appveyor_min_034_v2'	2018-05-23 15:08:50 -04:00
Nick Mathewson	36a107855b	Merge branch 'bug26156_034'	2018-05-23 09:08:57 -04:00
Nick Mathewson	e5541996b7	changes file for TROVE-2018-005	2018-05-22 12:29:14 -04:00
Nick Mathewson	a3a8d80beb	Merge branch 'trove-2018-005_032' into trove-2018-005_033	2018-05-22 12:27:15 -04:00
Nick Mathewson	d2bc019053	changes file for TROVE-2018-005	2018-05-22 12:26:23 -04:00
Nick Mathewson	48d752407b	Add a missing include to get the declaration of OPENSSL_1_1_API ... Apparently, even though I had tested on OpenSSL 1.1.1 with no-deprecated, OpenSSL 1.1.0 is different enough that I should have tested with that as well. Fixes bug 26156; bugfix on 0.3.4.1-alpha where we first declared support for this configuration.	2018-05-22 10:05:27 -04:00
Nick Mathewson	e053c71e3e	Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2	2018-05-22 09:57:12 -04:00
Nick Mathewson	0c81bdc9ef	changes file for appveyor support	2018-05-22 09:56:33 -04:00
Nick Mathewson	6c35ad08cf	Add a missing "return -1" when checking for Ed25519 ID loops ... Fixes bug 26158; bugfix on 0.3.0.1-alpha.	2018-05-22 08:54:17 -04:00
Nick Mathewson	add00045aa	Merge branch 'bug26101_26102'	2018-05-22 08:42:04 -04:00
Nick Mathewson	87a7748a84	remove already-merged changes file	2018-05-22 08:36:03 -04:00
Nick Mathewson	d2aefffe2f	Merge branch 'maint-0.3.3'	2018-05-22 08:35:41 -04:00
Nick Mathewson	3d12663243	Fix a crash bug when testing reachability ... Fixes bug 25415; bugfix on 0.3.3.2-alpha.	2018-05-22 08:35:37 -04:00
Nick Mathewson	8483241b4e	Improve openssl_version tests with better messages ... These tests would report errors, but wouldn't report the offending strings.	2018-05-21 15:16:07 -04:00
Nick Mathewson	943291d7ae	Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog	2018-05-17 12:47:06 -04:00
Nick Mathewson	3c4353179f	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-05-16 12:11:45 -04:00
Nick Mathewson	8340f641c3	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-05-16 12:11:45 -04:00
Nick Mathewson	d3a972561a	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-05-16 12:11:45 -04:00
Nick Mathewson	d1e4ffc710	Merge branch 'bug26072_029' into maint-0.2.9	2018-05-16 12:11:40 -04:00
Nick Mathewson	ddc3eb20b7	Merge branch 'bug26116_029' into bug26116_033	2018-05-16 11:43:53 -04:00
Nick Mathewson	881f7157f6	Return -1 from our PEM password callback ... Apparently, contrary to its documentation, this is how OpenSSL now wants us to report an error. Fixes bug 26116; bugfix on 0.2.5.16.	2018-05-16 11:39:42 -04:00
Nick Mathewson	fcfa22d80a	Merge branch 'maint-0.3.3'	2018-05-16 12:11:46 -04:00
Nick Mathewson	e811bac837	use sortChanges to begin an 0.3.4.1-alpha changelog	2018-05-15 12:31:16 -04:00
Nick Mathewson	98aff146d3	Merge branch 'maint-0.3.3'	2018-05-15 09:32:45 -04:00
Nick Mathewson	6acbd4c112	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-05-15 09:32:44 -04:00
Nick Mathewson	4aa3d511b2	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-05-15 09:32:44 -04:00
Nick Mathewson	502d2c0062	Merge branch 'maint-0.2.9' into maint-0.3.1	2018-05-15 09:32:44 -04:00
Karsten Loesing	033e4723f3	Update geoip and geoip6 to the May 1 2018 database.	2018-05-15 15:20:09 +02:00
Nick Mathewson	db94d7fed2	Update cov-diff to handle new gcov, and remove timestamps ... The new gcov sometimes emits *s if there is a line containing multiple basic blocks, and some are not executed. (The gcov documentation says something weird about this point, so I'm trying to interpret it into the compilerese that I'm familiar with.) That's bug 26101. Also, when we're looking for unique variations in our coverage, we would like cov-diff to suppress timestamps on the diffs. That's bug 26102. Both of these are bugfixes on 0.2.5.1-alpha when the cov-diff script was introduced. My apologies for the perl.	2018-05-14 18:04:10 -04:00
Nick Mathewson	5eb2d58880	Add a missing return after marking a stream for bad connected cell ... Fixes bug 26072; bugfix on 0.2.4.7-alpha.	2018-05-14 15:54:48 -04:00
Nick Mathewson	a394a2dd86	Merge branch 'bug25903_v5_squashed'	2018-05-14 14:25:07 -04:00
Nick Mathewson	d27fd7ff6b	Merge remote-tracking branch 'rl1987/bug25852_take2'	2018-05-14 14:05:50 -04:00
Nick Mathewson	aab626405c	Merge remote-tracking branch 'catalyst-github/bug25756'	2018-05-11 18:15:43 -04:00
Nick Mathewson	f6c96fd0ca	Merge remote-tracking branch 'public/bug25994'	2018-05-11 17:57:59 -04:00
Nick Mathewson	d50d07fce5	changes file for 25943 and 25944	2018-05-11 08:16:02 -04:00
Nick Mathewson	b343ba9060	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-05-10 09:22:32 -04:00
Nick Mathewson	7ee67c47fa	Merge branch 'maint-0.3.1' into maint-0.3.2	2018-05-10 09:22:32 -04:00
Nick Mathewson	382beb93cb	Merge branch 'maint-0.3.3'	2018-05-10 09:22:32 -04:00
David Goulet	6e99286d45	hs-v3: Add an extra white-space when parsing descriptor ... The specification describes the signature token to be right after a newline (\n) then the token "signature" and then a white-space followed by the encoded signature. This commit makes sure that when we parse the signature from the descriptor, we are always looking for that extra white-space at the end of the token. It will allow us also to support future fields that might start with "signature". Fixes #26069 Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-05-10 09:16:50 -04:00
Nick Mathewson	1eede00a4b	Merge branch 'ticket26063_squashed'	2018-05-10 09:13:28 -04:00
Nick Mathewson	beca6a585c	Merge branch 'ticket26064'	2018-05-10 09:05:15 -04:00
Nick Mathewson	8b4cf7771e	Enable/disable per-second callback as needed. ... There are three cases where this can happen: changes in our controller events, changes in our DisableNetwork setting, and changes in our hibernation state. Closes ticket 26063.	2018-05-10 09:02:44 -04:00
Nick Mathewson	a4a7939ae1	Merge remote-tracking branch 'dgoulet/ticket26062_034_01'	2018-05-10 08:04:03 -04:00