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
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
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
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
c2e546aa23
Merge remote-tracking branch 'argonblue/bug22410'
2017-06-19 15:30:23 -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
32948ebc54
Merge branch '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
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
Nick Mathewson
493d9cd17b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-09 09:58:46 -04:00
Nick Mathewson
cd7d006e08
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-09 09:58:46 -04:00
Nick Mathewson
3f40d9ec20
Merge branch 'maint-0.3.0'
2017-06-09 09:58:46 -04:00
Nick Mathewson
307be8d4a7
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-09 09:58:45 -04:00
Nick Mathewson
24ee8595bf
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-09 09:58:45 -04:00
Nick Mathewson
3913f959e3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-09 09:58:45 -04:00
Nick Mathewson
325c507a09
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-09 09:58:45 -04:00
Karsten Loesing
104e8fa751
Update geoip and geoip6 to the June 8 2017 database.
2017-06-09 15:47:49 +02:00
Nick Mathewson
4f4d3de80c
Merge branch 'maint-0.3.0'
...
"ours" merge to avoid version bump.
2017-06-08 14:06:49 -04:00
Nick Mathewson
ddfb877242
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump.
2017-06-08 14:06:41 -04:00
Nick Mathewson
875b1fbfba
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-08 14:06:28 -04:00
Nick Mathewson
6e90d75061
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-08 14:06:16 -04:00
Nick Mathewson
2f6be06f6a
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
"ours" merge to avoid version bump.
2017-06-08 14:06:06 -04:00
Nick Mathewson
eb92d11f53
Merge branch 'maint-0.2.5' into maint-0.2.6
...
"ours" merge to avoid version bump.
2017-06-08 14:05:59 -04:00
Nick Mathewson
1a7af7470f
Merge branch 'maint-0.2.4' into maint-0.2.5
...
"ours" merge to avoid version bump.
2017-06-08 14:05:37 -04:00
