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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into release-0.2.9

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