Merge branch 'maint-0.3.5'
commit27853938a19bc6a861a7575ad059982bb5006e6e
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:40 +0000 (3 09:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:40 +0000 (3 09:02 -0500)
treec608245ba7dd2c8b6d351a25ade515aa49505a83
parent3e7f13a4ef6ff96617f26f434efa529bbf17f9ef
parented62f0fa151f7a21a9634fbec1e95832ddbede94
Merge branch 'maint-0.3.5'
src/core/or/connection_or.c
src/lib/tls/tortls_openssl.c