commit 36a107855b92d2c4cccb31081058b5fceb77c6ca Merge: 68680a239 48d752407 Author: Nick Mathewson nickm@torproject.org Date: Wed May 23 09:08:57 2018 -0400

Merge branch 'bug26156_034'

changes/bug26156 | 3 +++ src/common/aes.c | 1 + 2 files changed, 4 insertions(+)