[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2