[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

[nickm at torproject.org]

commit c8cb55659acca96530a1d7f54bb96cac84626e17
Merge: 59fa0c2 75388f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 17 09:18:45 2015 -0400

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

 changes/bug16360-failed-crypto-early-init |    7 +++++++
 src/or/main.c                             |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)