Unverified Commit ef345ab5 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

parents 9be65c44 85ff6f91
o Minor bugfixes (memory leak):
- Avoid a minor memory leak that could occur on relays when
creating a keys directory failed. Fixes bug 30148; bugfix on
......@@ -188,7 +188,7 @@ load_ed_keys(const or_options_t *options, time_t now)
/* Check/Create the key directory */
if (create_keys_directory(options) < 0)
return -1;
goto err;
char *fname;
if (options->master_key_fname) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment