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

[nickm at torproject.org]

commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4
Merge: 0483f7f64 a28c14aad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 29 11:17:31 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 Makefile.am      | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)