06414b9922
Merge branch 'maint-0.3.1'
2017-06-26 11:39:43 -04:00
8f59661dba
Merge branch 'bug22212_squashed' into maint-0.3.1
2017-06-26 11:27:09 -04:00
0c4751b591
Changes file for Bug 22212.
2017-06-26 11:26:59 -04:00
89d0261eb5
Merge remote-tracking branch 'isis/bug4019'
2017-06-23 14:38:20 -04:00
424c4586df
Add changes file for bug4019.
2017-06-23 18:31:16 +00:00
80360ed9fa
Merge branch 'bug3056_squashed'
2017-06-23 09:28:27 -04:00
96fab4aaa6
Improve clarity, safety, and rate of dns spoofing log msg
...
Closes ticket 3056.
2017-06-23 09:28:17 -04:00
2c49a9852d
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-22 10:56:08 -04:00
90046a09dd
Merge branch 'maint-0.3.1'
2017-06-22 10:56:08 -04:00
ee7101a875
expand changes file for bug 22461
2017-06-22 08:16:56 -04:00
b9d8c8b126
Merge remote-tracking branch 'rl1987/bug22461'
2017-06-22 08:11:36 -04:00
dc9ec519b5
Merge remote-tracking branch 'public/bug7890'
2017-06-22 08:04:12 -04:00
3a8a92fddd
Merge branch 'callgraph_reduction_v2'
2017-06-21 16:47:55 -04:00
5dcc6bef1e
Add GETINFO targets to determine whether md/desc fetching is enabled
...
Closes ticket 22684.
2017-06-21 16:45:31 -04:00
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
5d3f484f4a
Merge branch 'maint-0.3.1'
2017-06-21 13:54:07 -04:00
784b29a2bf
Merge branch 'bug22356_029' into maint-0.3.1
2017-06-21 13:54:02 -04:00
72b132e2a4
changes file for ticket22311
2017-06-21 13:49:17 -04:00
0a96d11539
Better error message for GETINFO desc/(id|name) whenever microdescriptors are in use. Fixes #5847 .
2017-06-21 12:19:01 -04:00
aafeffe02a
Fix the changes file
2017-06-21 11:15:44 -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
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
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
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
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
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
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
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
c2e546aa23
Merge remote-tracking branch 'argonblue/bug22410'
2017-06-19 15:30:23 -04:00
e3efc076c5
Downgrade "assign_to_cpuworker failed" to INFO.
...
Closes ticket 22356
2017-06-19 15:24:33 -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
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
eff5e29404
Merge branch 'maint-0.3.0' into 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
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
5b5e20a478
Add "fingerprint" line to bridge network status.
...
Implements #22207 .
2017-06-11 10:21:36 +02: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
Nick Mathewson
Mike Perry
Isis Lovecruft
Kevin Butler
Ravi Chandra Padmala
Taylor Yu
David Goulet
Karsten Loesing