Merge remote-tracking branch 'origin/maint-0.2.6'

2024-12-06 19:41:15 +01:00 · 2015-06-17 09:19:11 -04:00
parent 8092ae0c4e c8cb55659a
commit 43a98c7da6
2 changed files with 8 additions and 1 deletions
@@ -0,0 +1,7 @@
+  o Minor bugfixes (crypto error-handling):
+    - If crypto_early_init fails, a typo in a return value from tor_init
+      means that tor_main continues running, rather than returning
+      an error value.
+      Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha,
+      introduced when implementing #4900.
+      Patch by "teor".