[tor-commits] [tor/master] Fix a compilation warning about duplicate typedef