summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-17 09:18:45 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-17 09:18:45 -0400
commitc8cb55659acca96530a1d7f54bb96cac84626e17 (patch)
tree1586bfb3390c9738df379163792748b566428734 /changes
parent59fa0c2d996621af5c6990534fe9a07864882975 (diff)
parent75388f67c07d1a48c6fb9c5d1c4441ab66b644c0 (diff)
downloadtor-c8cb55659acca96530a1d7f54bb96cac84626e17.tar.gz
tor-c8cb55659acca96530a1d7f54bb96cac84626e17.zip
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
-rw-r--r--changes/bug16360-failed-crypto-early-init7
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init
new file mode 100644
index 0000000000..21972bce52
--- /dev/null
+++ b/changes/bug16360-failed-crypto-early-init
@@ -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".