tor

commit f647035b3783eb14c79cea949b36efa97861fbc2
parent 17a923941a41d9283cad0cb093024c872fafdb0a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 13 Feb 2018 16:55:18 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

Diffstat:
M
changes/bug21074_downgrade
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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.