Merge branch 'maint-0.2.8' into release-0.2.8

2016-07-05 12:58:18 -04:00 · 2016-07-05 12:58:18 -04:00 · aeb95c2091
parent 6220cd13c5 717eae3b8f
commit aeb95c2091
3 changed files with 3 additions and 3 deletions
--- 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.

--- 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.
--- 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.