Nick Mathewson 0db5c54957 Merge branch 'nss_squashed' into nss_merge 5 lat temu
..
auth_dirs.inc b6c50c6259 Merge branch 'maint-0.3.4' 5 lat temu
config.c 0db5c54957 Merge branch 'nss_squashed' into nss_merge 5 lat temu
config.h ef486e3c02 Fix every include path changed in the previous commit (automated) 5 lat temu
confparse.c fe3bacf50a Convert __OwningControllerFD to a 64-bit value 5 lat temu
confparse.h fe3bacf50a Convert __OwningControllerFD to a 64-bit value 5 lat temu
fallback_dirs.inc 63b4ea22af Move literally everything out of src/or 5 lat temu
or_options_st.h 3507fead10 Merge branch 'tor_api_owning_control' 5 lat temu
or_state_st.h ef106ce788 Document the headers in src/app/config/ 5 lat temu
statefile.c a2c44a7a7e Isolate resolve.h usage in the modules that really need it. 5 lat temu
statefile.h ef106ce788 Document the headers in src/app/config/ 5 lat temu