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

[nickm at torproject.org]

commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4
Merge: 78386d8cd 93da2cae4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 16:39:25 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26787 | 3 +++
 1 file changed, 3 insertions(+)