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
commitcb9a322b675d0aa1178ab92af13b9ec92008c8d4 (patch)
treeab96d8a7354a88b12b6afd40bd20700b8b3ffb21
parentb062730a11a78f9cb11e4b0af20a66997280c0f9 (diff)
parentf647035b3783eb14c79cea949b36efa97861fbc2 (diff)
downloadtor-cb9a322b675d0aa1178ab92af13b9ec92008c8d4.tar.gz
tor-cb9a322b675d0aa1178ab92af13b9ec92008c8d4.zip
Merge branch 'maint-0.3.1' into maint-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.