From be27bde4d48f764b41493f4ec3b15385ceb51e84 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 10 May 2018 17:28:56 +1200 Subject: cmdline: --conf -> --confdir, which specifies the config directory, not the yaml options file This is a much more sensible behaviour for the flag. --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 5297cc10..89878225 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,8 @@ * Configure mitmproxy console keybindings with the keys.yaml file. See docs for more. ** Breaking Changes ** + * The --conf command-line flag is now --confdir, and specifies the mitmproxy configuration + directory, instead of the options yaml file (which is at `config.yaml` under the configuration directory). * `allow_remote` got replaced by `block_global` and `block_private` (#3100) * No more custom events (#3093) * The `cadir` option has been renamed to `confdir` -- cgit v1.2.3