[tor-commits] [tor/master] fixup! Extract or_options_t from or.h