[tor-commits] [tor/master] Merge branch 'trove-2017-011_025' into maint-0.2.5