summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-12 12:27:25 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-12 12:27:25 -0400
commiteecd410984e3f1741dda877fe482e082a41db700 (patch)
treeef0d1c8e82d739e81a3f0e528115b9b5fb319d81 /changes
parenta00d07ac1bddd84dd6109cae7afda970d5722d24 (diff)
parent24c031b1a28658c921a746f4d58f3ca5e9994108 (diff)
downloadtor-eecd410984e3f1741dda877fe482e082a41db700.tar.gz
tor-eecd410984e3f1741dda877fe482e082a41db700.zip
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
Diffstat (limited to 'changes')
-rw-r--r--changes/bug150644
-rw-r--r--changes/bug152055
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug15064 b/changes/bug15064
new file mode 100644
index 0000000000..e6bd747b1f
--- /dev/null
+++ b/changes/bug15064
@@ -0,0 +1,4 @@
+ o Major bugfixes (FreeBSD IPFW transparent proxy):
+ - Fix address detection with FreeBSD transparent proxies,
+ when "TransProxyType ipfw" is in use.
+ Fixes bug 15064; bugfix on 0.2.5.4-alpha.
diff --git a/changes/bug15205 b/changes/bug15205
new file mode 100644
index 0000000000..0cb9f3f4bc
--- /dev/null
+++ b/changes/bug15205
@@ -0,0 +1,5 @@
+ o Major bugfixes (crash, OSX, security):
+ - Fix a remote denial-of-service opportunity caused by a bug
+ in OSX's _strlcat_chk() function. Fixes bug 15205; bug first
+ appeared in OSX 10.9.
+