From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Feb 2016 19:46:33 +0000 (-0500)
Subject: Merge branch 'openssl_compat'
X-Git-Tag: tor-0.2.8.1-alpha~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5f7a8b047e3e0e58604b054ef98b998be537523;p=thirdparty%2Ftor.git

Merge branch 'openssl_compat'
---

a5f7a8b047e3e0e58604b054ef98b998be537523