[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit 51d9444823b95eeec60ae8e45d63017323016978
Merge: c97c2c690 ae4c94bb6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 13 08:27:29 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug28413                | 4 ++++
 src/lib/crypt_ops/aes_openssl.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)