aafeffe02a
Fix the changes file
2017-06-21 11:15:44 -04:00
ed4bc55450
Replace peek_buf_startswith() with a safe version
...
It's not okay to assume that the data in a buf_t is contiguous in
the first chunk.
2017-06-21 11:10:58 -04:00
acf65544bb
Fix compilation on 1667 code.
2017-06-21 10:35:35 -04:00
417d778652
Respond meaningfully to HTTP requests on the control port. Fix #1667
...
(Squashed with bufferevents portions removed, by nickm)
2017-06-21 10:34:26 -04:00
884c0ffe3b
Merge branch 'maint-0.3.1'
2017-06-20 20:29:00 -04:00
e51e7bd38b
Merge branch 'bug22502_redux_031' into maint-0.3.1
2017-06-20 20:27:48 -04:00
c999e84436
Merge branch 'bug22672_031' into maint-0.3.1
2017-06-20 20:26:45 -04:00
3830599a63
Merge branch 'maint-0.3.1'
2017-06-20 14:18:35 -04:00
c4152a25e3
Note that bw_accounting is obsoleted by values in the state file
...
Closes ticket 16082.
2017-06-20 14:18:10 -04:00
fa2bd196b4
Merge branch 'maint-0.3.1'
2017-06-20 13:54:35 -04:00
fecc66d1e6
Note that pkgconfig is now needed, and has been for a few releases.
2017-06-20 13:54:30 -04:00
a9a76aa6ae
Merge branch 'maint-0.3.1'
2017-06-20 13:35:44 -04:00
392e5457b8
Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1
2017-06-20 13:35:38 -04:00
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
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
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
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
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
94a1b8b66c
Add a unit test for decompressing concatenated inputs.
2017-06-20 10:21:35 -04:00
dd9f255e5b
Merge branch 'maint-0.3.1'
2017-06-20 10:12:47 -04:00
c1c938e80c
add a changes file for 22626, 22628, and 22629 (parts of 22502)
2017-06-20 10:12:40 -04:00
2341368515
Merge branch 'maint-0.3.1'
2017-06-20 10:06:19 -04:00
1c0459f19a
Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1
2017-06-20 10:04:16 -04:00
c2e546aa23
Merge remote-tracking branch 'argonblue/bug22410'
2017-06-19 15:30:23 -04:00
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
e01e4e0146
Merge branch 'ticket20575_031_01_squashed'
2017-06-19 14:16:21 -04:00
0379439fe8
refer to the correct version
2017-06-19 14:15:04 -04:00
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
bf95d678e8
Remove an XXXX RD comment that neither Roger or I understand. Closes 22420
2017-06-19 14:06:07 -04:00
f6946d7a82
Merge remote-tracking branch 'arma/ticket22420'
2017-06-19 14:03:57 -04:00
eff5e29404
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-19 13:52:19 -04:00
32948ebc54
Merge branch 'maint-0.3.1'
2017-06-19 13:52:19 -04:00
71c701927a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-19 13:52:19 -04:00
1c64133cb3
Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
2017-06-19 13:50:49 -04:00
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
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
b4c9eb0aab
Document sr-random and diff-cache.
2017-06-16 14:44:04 -04:00
a73d0fe9a8
Document key-pinning-journal
...
Closes 22347
2017-06-16 14:26:50 -04:00
59f29970fa
Permit the fchmod system call.
...
Fixes bug 22516; bugfix on 0.2.5.4-alpha.
2017-06-16 14:03:02 -04:00
7d535ea9d3
Add extra logging during compression and decompression
...
This helps diagnose failures.
Part of #22502 .
2017-06-16 09:48:18 +10:00
cbaf0c049c
Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input
...
Fixes #22628 .
2017-06-16 09:47:32 +10:00
617e1da636
Remove a redundant conditional in tor_zstd_compress_process
...
Part of #22502
2017-06-16 09:46:46 +10:00
7605bd528e
Move a comment to the right place in tor_zstd_compress_process
...
Part of #22502
2017-06-16 09:45:58 +10:00
952c9073ad
Check for trailing input garbage in tor_compress_impl() when decompressing
...
Fixes #22629 .
2017-06-16 09:41:29 +10:00
8e1b37a4aa
Check if tor_compress_new() returns NULL in tor_compress_impl()
...
Partial fix to 22626.
2017-06-16 09:38:18 +10:00
80ad374b84
Remove old callgraph scripts; recommend calltool instead.
2017-06-14 17:44:15 -04:00
493d9cd17b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-09 09:58:46 -04:00
cd7d006e08
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-09 09:58:46 -04:00
3f40d9ec20
Merge branch 'maint-0.3.0'
2017-06-09 09:58:46 -04:00
307be8d4a7
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-09 09:58:45 -04:00
Nick Mathewson
Ravi Chandra Padmala
Taylor Yu
David Goulet
teor