Nick Mathewson
90046a09dd
Merge branch 'maint-0.3.1'
2017-06-22 10:56:08 -04:00
Nick Mathewson
2c49a9852d
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-22 10:56:08 -04:00
Nick Mathewson
ee7101a875
expand changes file for bug 22461
2017-06-22 08:16:56 -04:00
Nick Mathewson
b9d8c8b126
Merge remote-tracking branch 'rl1987/bug22461'
2017-06-22 08:11:36 -04:00
Nick Mathewson
dc9ec519b5
Merge remote-tracking branch 'public/bug7890'
2017-06-22 08:04:12 -04:00
Nick Mathewson
3a8a92fddd
Merge branch 'callgraph_reduction_v2'
2017-06-21 16:47:55 -04:00
Nick Mathewson
1c0a2335cd
Extract channel_do_open_actions() from non-open _change_state cases
...
This reduces the size of the largest SCC in the callgraph by 30
functions, from 58 to 28.
2017-06-21 14:03:00 -04:00
Nick Mathewson
5d3f484f4a
Merge branch 'maint-0.3.1'
2017-06-21 13:54:07 -04:00
Nick Mathewson
784b29a2bf
Merge branch 'bug22356_029' into maint-0.3.1
2017-06-21 13:54:02 -04:00
Nick Mathewson
72b132e2a4
changes file for ticket22311
2017-06-21 13:49:17 -04:00
Kevin Butler
0a96d11539
Better error message for GETINFO desc/(id|name) whenever microdescriptors are in use. Fixes #5847 .
2017-06-21 12:19:01 -04:00
Nick Mathewson
884c0ffe3b
Merge branch 'maint-0.3.1'
2017-06-20 20:29:00 -04:00
Nick Mathewson
e51e7bd38b
Merge branch 'bug22502_redux_031' into maint-0.3.1
2017-06-20 20:27:48 -04:00
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
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
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
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
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
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
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
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
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
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
d2839eeac9
Fold TROVE-2017-00[45] into changelog
2017-06-08 09:32:00 -04:00
Nick Mathewson
a0664fd0c3
bump to 0.3.0.8
2017-06-08 09:24:28 -04:00
Nick Mathewson
d15d09a968
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-08 09:21:15 -04:00
Nick Mathewson
c1646d6e89
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-08 09:21:15 -04:00
Nick Mathewson
40bccc2004
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-08 09:21:15 -04:00
Nick Mathewson
dec7998f5c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-08 09:21:15 -04:00
Nick Mathewson
987c7cae70
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-08 09:21:15 -04:00
Nick Mathewson
53011e3e54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-08 09:21:15 -04:00
