[tor-commits] [tor/master] Remove two obsoleted options.