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

[nickm at torproject.org]

commit 48bd65921466d73ae4178151fe7a671e60c9bfd8
Merge: 0978889 a56cfda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6