summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-05-28 14:06:01 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-28 14:06:01 -0400
commitb66f4cfc9dfdde9e233424ba4c9c25127adc3435 (patch)
tree1fdf2703d437127b28db51ca1bdd6a98b67d637f /changes
parent5dce1829bf8615f78975e1b7d651e97c266b509a (diff)
parent97330ced0c2e0eeae9bb2bc576bb72190237819d (diff)
downloadtor-b66f4cfc9dfdde9e233424ba4c9c25127adc3435.tar.gz
tor-b66f4cfc9dfdde9e233424ba4c9c25127adc3435.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug160303
-rw-r--r--changes/bug162125
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug16030 b/changes/bug16030
new file mode 100644
index 0000000000..c14fd62303
--- /dev/null
+++ b/changes/bug16030
@@ -0,0 +1,3 @@
+ o Minor bugfixes (tests):
+ - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix on
+ 0.2.6.2-alpha. Patch from "NewEraCracker". \ No newline at end of file
diff --git a/changes/bug16212 b/changes/bug16212
new file mode 100644
index 0000000000..bc1246376d
--- /dev/null
+++ b/changes/bug16212
@@ -0,0 +1,5 @@
+ o Minor bugfixes (sandbox, systemd):
+ - Allow systemd connections to work with the Linux seccomp2 sandbox
+ code. Fixes bug 16212; bugfix on 0.2.6.2-alpha.
+ Patch by Peter Palfrader.
+