25427 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	c999e84436	Merge branch 'bug22672_031' into maint-0.3.1	2017-06-20 20:26:45 -04:00
Nick Mathewson	3830599a63	Merge branch 'maint-0.3.1'	2017-06-20 14:18:35 -04:00
Nick Mathewson	c4152a25e3	Note that bw_accounting is obsoleted by values in the state file ... Closes ticket 16082.	2017-06-20 14:18:10 -04:00
Nick Mathewson	fa2bd196b4	Merge branch 'maint-0.3.1'	2017-06-20 13:54:35 -04:00
Nick Mathewson	fecc66d1e6	Note that pkgconfig is now needed, and has been for a few releases.	2017-06-20 13:54:30 -04:00
Nick Mathewson	a9a76aa6ae	Merge branch 'maint-0.3.1'	2017-06-20 13:35:44 -04:00
Nick Mathewson	392e5457b8	Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1	2017-06-20 13:35:38 -04:00
Nick Mathewson	9328bd524e	Enforce the rule that COMPRESS_OK means progress was made. ... If COMPRESS_OK occurs but data is neither consumed nor generated, treat it as a BUG and a COMPRESS_ERROR. This change is meant to prevent infinite loops in the case where we've made a mistake in one of our compression backends. Closes ticket 22672.	2017-06-20 12:26:57 -04:00
Nick Mathewson	945256188a	mingw/windows printf lacks %zd ; use %lu and casts instead ... (This approach can lose accuracy, but it's only in debug-level messages.) Fixes windows compilation. Bugfix on recent compress.c changes; bug not in any released Tor.	2017-06-20 12:12:55 -04:00
Nick Mathewson	5537e1fc45	If we successfully decompress an HTTP body, return immediately. ... This prevents us from calling allowed_anonymous_connection_compression_method() on the unused guessed method (if any), and rejecting something that was already safe to use.	2017-06-20 12:08:12 -04:00
Nick Mathewson	d8cd68caf1	If a _guessed_ compression method fails, it is never PROTOCOL_WARN. ... Rationale: When use a guessed compression method, we already gave a PROTOCOL_WARN when our guess differed from the declared method, AND we gave a PROTOCOL_WARN when the declared method failed. It is not a protocol problem that the guessed method failed too; it's just a recovery attempt that failed.	2017-06-20 12:08:11 -04:00
Nick Mathewson	7b3161f008	It should be a PROTOCOL_WARN when we have an incorrect content-encoding. ... Rationale: The server did not obey the protocol, and its content-encoding got munged. That's what PROTOCOL_WARN is for.	2017-06-20 12:08:11 -04:00
Nick Mathewson	9018da06c7	Short-circuit the no-decompression-needed case, for clarity ... This commit is mostly just deindentation.	2017-06-20 11:46:54 -04:00
Nick Mathewson	c0e9698fca	Extract "decompress" portion of connection_dir_client_reached_eof()	2017-06-20 11:43:37 -04:00
Taylor Yu	25edb41e6f	Fix compress_none.c header comment ... The Doxygen \file markup for compress_none.c had the wrong filename. Fixes #22638.	2017-06-20 11:27:17 -04:00
Nick Mathewson	782eb02b79	Send the correct content-encoding when serving cached_dir_t objects ... A cached_dir_t object (for now) is always compressed with DEFLATE_METHOD, but in handle_get_status_vote() to we were using the general compression-negotiation code decide what compression to claim we were using. This was one of the reasons behind 22502. Fixes bug 22669; bugfix on 0.3.1.1-alpha	2017-06-20 11:26:51 -04:00
Nick Mathewson	eb632afb17	Correct the fix to bug 22629 to permit trailing non-garbage ... This change makes it so that we can decompress concatenated zstd outputs.	2017-06-20 10:24:22 -04:00
Nick Mathewson	94a1b8b66c	Add a unit test for decompressing concatenated inputs.	2017-06-20 10:21:35 -04:00
Nick Mathewson	dd9f255e5b	Merge branch 'maint-0.3.1'	2017-06-20 10:12:47 -04:00
Nick Mathewson	c1c938e80c	add a changes file for 22626, 22628, and 22629 (parts of 22502)	2017-06-20 10:12:40 -04:00
Nick Mathewson	2341368515	Merge branch 'maint-0.3.1'	2017-06-20 10:06:19 -04:00
Nick Mathewson	1c0459f19a	Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1	2017-06-20 10:04:16 -04:00
Nick Mathewson	32e486de97	Don't expand guard sample set unless consensus is "reasonably live" ... Fixes what I think is the main root cause of 22400. Bugfix on 0.3.0.1-alpha.	2017-06-19 15:48:47 -04:00
Nick Mathewson	1721487bea	Remove hardwired libfuzzer path; closes 22105.	2017-06-19 15:35:46 -04:00
Nick Mathewson	c2e546aa23	Merge remote-tracking branch 'argonblue/bug22410'	2017-06-19 15:30:23 -04:00
Nick Mathewson	e3efc076c5	Downgrade "assign_to_cpuworker failed" to INFO. ... Closes ticket 22356	2017-06-19 15:24:33 -04:00
Taylor Yu	027614c263	Ensure that uint8_t is unsigned char ... Many places in our code assume that uint8_t is the same type as unsigned char. Test this assumption in the configure script. This is important because of the privileged aliasing properties of character types in C. Fixes #22410.	2017-06-19 14:28:36 -04:00
Nick Mathewson	e01e4e0146	Merge branch 'ticket20575_031_01_squashed'	2017-06-19 14:16:21 -04:00
Nick Mathewson	0379439fe8	refer to the correct version	2017-06-19 14:15:04 -04:00
David Goulet	3f807ec058	config: Deprecate HTTPProxy option ... Move the HTTPProxy option to the deprecated list so for now it will only warn users but feature is still in the code which will be removed in a future stable version. Fixes #20575 Signed-off-by: David Goulet <dgoulet@torproject.org>	2017-06-19 14:14:17 -04:00
Nick Mathewson	bf95d678e8	Remove an XXXX RD comment that neither Roger or I understand. Closes 22420	2017-06-19 14:06:07 -04:00
Nick Mathewson	f6946d7a82	Merge remote-tracking branch 'arma/ticket22420'	2017-06-19 14:03:57 -04:00
Nick Mathewson	eff5e29404	Merge branch 'maint-0.3.0' into maint-0.3.1	2017-06-19 13:52:19 -04:00
Nick Mathewson	71c701927a	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-06-19 13:52:19 -04:00
Nick Mathewson	32948ebc54	Merge branch 'maint-0.3.1'	2017-06-19 13:52:19 -04:00
Nick Mathewson	1c64133cb3	Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9	2017-06-19 13:50:49 -04:00
Nick Mathewson	a3139c9750	Bump master to 0.3.2.0-alpha-dev. For 0.3.1, use maint-0.3.1	2017-06-19 11:57:44 -04:00
Nick Mathewson	5641e27ffb	Document more files in the datadirectory. ... This improved list comes from the ls -R results that weasel and ln5 sent me. Thanks!	2017-06-19 09:57:57 -04:00
Nick Mathewson	b4c9eb0aab	Document sr-random and diff-cache.	2017-06-16 14:44:04 -04:00
Nick Mathewson	a73d0fe9a8	Document key-pinning-journal ... Closes 22347	2017-06-16 14:26:50 -04:00
Nick Mathewson	59f29970fa	Permit the fchmod system call. ... Fixes bug 22516; bugfix on 0.2.5.4-alpha.	2017-06-16 14:03:02 -04:00
teor	7d535ea9d3	Add extra logging during compression and decompression ... This helps diagnose failures. Part of #22502.	2017-06-16 09:48:18 +10:00
teor	cbaf0c049c	Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input ... Fixes #22628.	2017-06-16 09:47:32 +10:00
teor	617e1da636	Remove a redundant conditional in tor_zstd_compress_process ... Part of #22502	2017-06-16 09:46:46 +10:00
teor	7605bd528e	Move a comment to the right place in tor_zstd_compress_process ... Part of #22502	2017-06-16 09:45:58 +10:00
teor	952c9073ad	Check for trailing input garbage in tor_compress_impl() when decompressing ... Fixes #22629.	2017-06-16 09:41:29 +10:00
teor	8e1b37a4aa	Check if tor_compress_new() returns NULL in tor_compress_impl() ... Partial fix to 22626.	2017-06-16 09:38:18 +10:00
Nick Mathewson	80ad374b84	Remove old callgraph scripts; recommend calltool instead.	2017-06-14 17:44:15 -04:00
Karsten Loesing	5b5e20a478	Add "fingerprint" line to bridge network status. ... Implements #22207.	2017-06-11 10:21:36 +02:00
Nick Mathewson	493d9cd17b	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-06-09 09:58:46 -04:00