Update vendored thor to the latest to fix #2734