summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-13 16:55:18 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-13 16:55:18 -0500
commitf647035b3783eb14c79cea949b36efa97861fbc2 (patch)
tree3fd5bfae108c56ddc4d6e493a04ae8f0024c3eb0
parent17a923941a41d9283cad0cb093024c872fafdb0a (diff)
parentf0ed7895caa5daf5f62c25129bbe2880026fbf26 (diff)
downloadtor-f647035b3783eb14c79cea949b36efa97861fbc2.tar.gz
tor-f647035b3783eb14c79cea949b36efa97861fbc2.zip
Merge branch 'maint-0.2.9' into maint-0.3.1
-rw-r--r--changes/bug21074_downgrade2
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/bug21074_downgrade b/changes/bug21074_downgrade
index c9f81bd137..1bc1f8523a 100644
--- a/changes/bug21074_downgrade
+++ b/changes/bug21074_downgrade
@@ -1,4 +1,4 @@
- o Minor bugfixes:
+ o Minor bugfixes (portability):
- Don't exit the Tor process if setrlimit() fails to change the file
limit (which can happen sometimes on some versions of OSX). Fixes
bug 21074; bugfix on 0.0.9pre5.