[tor-commits] [tor/maint-0.2.9] Merge branch 'trove-2017-012_025' into maint-0.2.5