[tor-commits] [tor/master] Move windows header macros into orconfig.h