nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
teor 2019-08-12 09:42:15 +10:00
commit ef345ab56d
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug30148 Normal file
View File

@ -0,0 +1,4 @@
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
0.3.3.1-alpha.

2
src/feature/relay/routerkeys.c
View File

@ -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) {