summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-13 16:55:19 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-13 16:55:19 -0500
commit4bfbce9de7ac84259e8c27939cace2952e98d0e6 (patch)
tree8cfdeb8c6a6c10321b619a2cf54de74b67ceabf0
parent6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd (diff)
parentcb9a322b675d0aa1178ab92af13b9ec92008c8d4 (diff)
downloadtor-4bfbce9de7ac84259e8c27939cace2952e98d0e6.tar.gz
tor-4bfbce9de7ac84259e8c27939cace2952e98d0e6.zip
Merge branch 'maint-0.3.2' into release-0.3.2
-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.