[tor-commits] [gettor/master] Changed some redundant option names