diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:58:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:58:28 -0400 |
commit | 6ea9d3fd42d6fa38f1a43fb0c5016c03d1eabd8b (patch) | |
tree | 8cf0f3d3f1f382a9d1a87b2b56a8c7b1877e77d4 | |
parent | 5c97b42cac83edfbe979f6a5399ed43c2cdad153 (diff) | |
parent | 717eae3b8fc6c90915a1306a093c68a7024feb55 (diff) | |
download | tor-6ea9d3fd42d6fa38f1a43fb0c5016c03d1eabd8b.tar.gz tor-6ea9d3fd42d6fa38f1a43fb0c5016c03d1eabd8b.zip |
Merge branch 'maint-0.2.8'
-rw-r--r-- | changes/bug19499 | 2 | ||||
-rw-r--r-- | changes/bug19556 | 2 | ||||
-rw-r--r-- | changes/bug19557 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/changes/bug19499 b/changes/bug19499 index 5db49bb749..59bdb29dfa 100644 --- a/changes/bug19499 +++ b/changes/bug19499 @@ -1,4 +1,4 @@ o Minor features (build): - Tor now again builds with the recent OpenSSL 1.1 development branch - (tested against 1.1.0-pre6-dev). + (tested against 1.1.0-pre6-dev). Closes ticket 19499. diff --git a/changes/bug19556 b/changes/bug19556 index f4ac894f46..31856b3db9 100644 --- a/changes/bug19556 +++ b/changes/bug19556 @@ -4,4 +4,4 @@ private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. - Fixes bug 19556. + Fixes bug 19556; bugfix on 0.2.5.1-alpha. diff --git a/changes/bug19557 b/changes/bug19557 index 9036cdc8e8..55214b0c97 100644 --- a/changes/bug19557 +++ b/changes/bug19557 @@ -1,4 +1,4 @@ o Major bugfixes (sandboxing): - Our sandboxing code would not allow us to write to stats/hidserv-stats, causing tor to abort while trying to write stats. This was previously - masked by bug 19556. Fixes bug 19557. + masked by bug 19556. Fixes bug 19557; bugfix on 0.2.6.1-alpha. |