[tor-commits] [tor/master] Merge branch 'appveyor_min_034_v2'