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

[arma at torproject.org]

commit 4a2afd5b33f02ed3e5eb591dd29537fa4f69399f
Merge: a86f95d 9ff7618
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 13 15:41:20 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9