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
commitcf04886c10415746b248e7007cd2533a56960fec (patch)
tree22e6783a0bad7032e13c0a73c65c100d8f77bebf
parentff02ea65ecb40069ba2023c331c5b60fa5ef2b02 (diff)
parentf0ed7895caa5daf5f62c25129bbe2880026fbf26 (diff)
downloadtor-cf04886c10415746b248e7007cd2533a56960fec.tar.gz
tor-cf04886c10415746b248e7007cd2533a56960fec.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-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.