Merge branch 'maint-0.2.7'

This commit is contained in:
Nick Mathewson 2015-12-17 14:57:16 -05:00
commit 8585cc57f8
2 changed files with 7 additions and 0 deletions

4
changes/bug17675 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (linux seccomp2 sandbox):
- Fix a crash when using offline master ed25519 keys with the
Linux seccomp2 sandbox enabled. Fixes bug 17675; bugfix on
0.2.7.3-alpha.

View File

@ -3462,6 +3462,9 @@ sandbox_init_filter(void)
".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_public_key", ".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key", ".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key_encrypted",
".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_public_key", ".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_cert", ".tmp");
OPEN_DATADIR2_SUFFIX("stats", "bridge-stats", ".tmp");