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

[nickm at torproject.org]

commit cc7a75dc03d34ffd038292a6ff0acf42d649cc4f
Merge: 71e563f26 df874ed0f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 10:01:41 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug26873 | 4 ++++
 1 file changed, 4 insertions(+)