summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-13 16:22:54 -0400
committerNick Mathewson <nickm@torproject.org>2017-03-13 16:22:54 -0400
commitd9cd4b7072f6292680c188ccb9fe8d2c5be4f610 (patch)
treec5bf6188bf9ec4ddb410519805e674cec0c4be30 /src
parent43dd9bf0fc341c9e6f2df1700ec8f5b64960c3f2 (diff)
parente2cd600da6e99c38193a6bd326b4208b1fc380d8 (diff)
downloadtor-d9cd4b7072f6292680c188ccb9fe8d2c5be4f610.tar.gz
tor-d9cd4b7072f6292680c188ccb9fe8d2c5be4f610.zip
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src')
-rw-r--r--src/or/confparse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/confparse.c b/src/or/confparse.c
index 9e352aca27..9b13a91856 100644
--- a/src/or/confparse.c
+++ b/src/or/confparse.c
@@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
tor_free(result);
return NULL;
case CONFIG_TYPE_LINELIST_S:
+ tor_free(result->key);
tor_free(result);
result = config_lines_dup_and_filter(*(const config_line_t **)value,
key);