Nick Mathewson
f6df433b91
Merge branch 'maint-0.3.1'
2017-06-26 14:30:21 -04:00
Nick Mathewson
32596016a2
Merge branch 'bug22105_031' into maint-0.3.1
2017-06-26 14:30:17 -04:00
Nick Mathewson
c29a559e7b
Merge branch 'maint-0.3.1'
2017-06-26 14:15:21 -04:00
Nick Mathewson
d72cfb259d
Patch for 22720 from huyvq: exit(1) more often
...
See changes file for full details.
2017-06-26 14:14:56 -04:00
Nick Mathewson
06414b9922
Merge branch 'maint-0.3.1'
2017-06-26 11:39:43 -04:00
Nick Mathewson
8f59661dba
Merge branch 'bug22212_squashed' into maint-0.3.1
2017-06-26 11:27:09 -04:00
Mike Perry
0c4751b591
Changes file for Bug 22212.
2017-06-26 11:26:59 -04:00
Mike Perry
0592ee45fc
Demote a log message due to libevent delays.
...
This is a side-effect of being single-threaded. The worst cases of this are
actually Bug #16585 .
2017-06-26 11:26:59 -04:00
Nick Mathewson
82a68be69a
Merge branch 'maint-0.3.1'
2017-06-26 10:32:57 -04:00
Nick Mathewson
0c7c49483f
Fix a coverity warning about a no-op assert with-64 bit size_t
...
This is CID 1403400
2017-06-26 10:31:13 -04:00
Nick Mathewson
acbe16a9a2
Log even more to try to debug 22719
2017-06-24 13:40:02 -04:00
Nick Mathewson
6caf924605
Add an additional log message to try to diagnose #22719
2017-06-24 11:27:46 -04:00
Nick Mathewson
89d0261eb5
Merge remote-tracking branch 'isis/bug4019'
2017-06-23 14:38:20 -04:00
Isis Lovecruft
424c4586df
Add changes file for bug4019.
2017-06-23 18:31:16 +00:00
Nick Mathewson
80360ed9fa
Merge branch 'bug3056_squashed'
2017-06-23 09:28:27 -04:00
Nick Mathewson
96fab4aaa6
Improve clarity, safety, and rate of dns spoofing log msg
...
Closes ticket 3056.
2017-06-23 09:28:17 -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
90046a09dd
Merge branch 'maint-0.3.1'
2017-06-22 10:56:08 -04:00
Nick Mathewson
bdd267e74d
Combine our "don't do this if no consensus" entryguards checks
...
Suggested by asn on 22400 review.
2017-06-22 09:28:30 -04:00
Nick Mathewson
ee7101a875
expand changes file for bug 22461
2017-06-22 08:16:56 -04:00
Nick Mathewson
34ecfeb479
whitespace fix
2017-06-22 08:16:48 -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
Isis Lovecruft
28344b74ba
config: Fix duplicate error message for nonlocal SocksPorts.
...
If `validate_only` is true, then just validate the configuration without warning
about it. This way, we only emit warnings when the listener is actually opened.
(Otherwise, every time we parse the config we will might re-warn and we would
need to keep state; whereas the listeners are only opened once.)
* FIXES #4019 .
2017-06-22 00:28:31 +00:00
Roger Dingledine
005500e14d
make assign_onionskin_to_cpuworker failure case more clear
...
now it looks like the other time we call it
2017-06-21 17:42:10 -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
Nick Mathewson
35d6313500
Call it a BUG to use -1 in authdir_mode_handles_descs
2017-06-21 13:49:17 -04:00
huyvq
ad97714f22
Remove obsolete authdir_mode_any_nonhidserv()
...
- Replace it with authdir_mode()
2017-06-21 13:49:17 -04:00
huyvq
18cd1993ca
Convert authdir_mode_handles_descs() to alternative wrappers
...
-authdir_mode_handles_descs(options, ROUTER_PURPOSE_BRIDGE) to authdir_mode_bridge(options).
- authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL) to authdir_mode_v3(options).
2017-06-21 13:49:17 -04:00
huyvq
d92b999757
Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options)
2017-06-21 13:49:17 -04:00
huyvq
0471c905a1
Remove obsolete authdir_mode_any_main()
2017-06-21 13:49:17 -04:00
Nick Mathewson
f0a5416f95
Merge branch 'Ryman-bug5847-squashed'
2017-06-21 12:19:55 -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
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
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
