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

[nickm at torproject.org]

commit aa5af6a238bc5f1cae548e416ada261b3a105d16
Merge: 75c6fdd 4060253
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 13:58:37 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0