Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson 2017-07-28 09:50:26 -04:00
commit 6252e04a37
2 changed files with 6 additions and 0 deletions

5
changes/bug23053 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (memory leak):
- Fix a small memory leak when validating a configuration that
uses two or more AF_UNIX sockets for the same port type.
Fixes bug 23053; bugfix on 0.2.6.3-alpha. This is CID
1415725.

View File

@ -6869,6 +6869,7 @@ parse_port_config(smartlist_t *out,
SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp));
smartlist_clear(elts);
tor_free(addrport);
tor_free(unix_socket_path);
}
if (warn_nonlocal && out) {