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

[nickm at torproject.org]

commit ea14d3408df7c846722b54484cf5b8d61de5384f
Merge: b89a66e99 890bc15ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:06:15 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

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