Merge branch 'maint-0.4.1'

This commit is contained in:
Nick Mathewson 2019-09-18 08:07:56 -04:00
commit d6d3e829dd
2 changed files with 7 additions and 1 deletions

4
changes/ticket31772 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (controller protocol):
- Fix the MAPADDRESS controller command to accept one or more
arguments. Previously, it required two or more arguments, and ignored
the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.

View File

@ -639,7 +639,9 @@ address_is_invalid_mapaddress_target(const char *addr)
}
static const control_cmd_syntax_t mapaddress_syntax = {
.max_args=1,
// no positional arguments are expected
.max_args=0,
// an arbitrary number of K=V entries are supported.
.accept_keywords=true,
};