[tor-commits] [tor/master] Re-order includes to expose intptr_t to tor_api_internal.h