commit 43a98c7da6183e6e2e20784faed9f1c8aea5086e Merge: 8092ae0 c8cb556 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 17 09:19:11 2015 -0400

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

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