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

[nickm at torproject.org]

commit d52380f1beb886e1b4a67c3efa125793218e6ef5
Merge: f875cd7 80aca15
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:49:46 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9