[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit b77889fc5f40208a7c79a82c7c6b9d7f48fbcd51
Merge: c6d3bebb1 6851a0809
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 24 10:20:53 2018 -0400

    Merge branch 'maint-0.3.5'

 changes/bug28115               |  3 +++
 src/lib/crypt_ops/crypto_ope.c | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)