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

[nickm at torproject.org]

commit 7001162b8e7a74573ea7196f09e46c8dce611a95
Merge: 08aaedb01 f57d8722e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 24 11:10:38 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27781 | 4 ++++
 src/common/aes.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)