[tor-commits] [tor/master] Merge branch 'no_openssl_100'

[nickm at torproject.org]

commit 4f169a020ac80411731dffb3b1ca79e09a3d7541
Merge: 80e2896 850ec1e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 6 16:36:49 2016 -0400

    Merge branch 'no_openssl_100'

 changes/no_openssl_100      | 4 ++++
 configure.ac                | 4 ++--
 src/common/compat_openssl.h | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)