aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2018-05-10 17:28:56 +1200
committerAldo Cortesi <aldo@nullcube.com>2018-05-10 17:35:37 +1200
commitbe27bde4d48f764b41493f4ec3b15385ceb51e84 (patch)
tree33556d213aa28519dbf4966c4413ca3a19e80d33 /CHANGELOG
parent1f02354196d3a850099447229aaa829fbd49e1e5 (diff)
downloadmitmproxy-be27bde4d48f764b41493f4ec3b15385ceb51e84.tar.gz
mitmproxy-be27bde4d48f764b41493f4ec3b15385ceb51e84.tar.bz2
mitmproxy-be27bde4d48f764b41493f4ec3b15385ceb51e84.zip
cmdline: --conf -> --confdir, which specifies the config directory, not the yaml options file
This is a much more sensible behaviour for the flag.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
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`