[tor-commits] [snowflake/master] Update for go1.6