Nick Mathewson 8221b5d587 Merge remote-tracking branch 'tor-github/pr/559' 7 lat temu
..
api 88c9730817 Re-order includes to expose intptr_t to tor_api_internal.h 7 lat temu
client 2b2b97484a Merge branch 'ticket27490a_squashed' 7 lat temu
control 7d8e0cc9ab Merge branch 'dormant_v2_squashed' 7 lat temu
dirauth 51d94cea33 Merge branch 'maint-0.3.5' 7 lat temu
dircache 8020d6fb05 Merge remote-tracking branch 'tor-github/pr/464' 7 lat temu
dirclient 18a4eaf5c1 Avoid mmap leak if we get a consensus diff we can't use. 7 lat temu
dircommon 988d4903a3 Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge 7 lat temu
dirparse 48b08f0592 Merge branch 'ticket27359_v2_squashed' 7 lat temu
hibernate 4bf79fa4fa Turn second_elapsed_callback into a normal periodic event. 7 lat temu
hs 02843c4a4e Test for check_network_participation_callback() 7 lat temu
hs_common 5febea0d54 Fix revision counter bugs caused by bad SRV start time computation. 7 lat temu
keymgt 934859cf80 Move key-loading and crosscert-checking out of feature/relay 7 lat temu
nodelist 8221b5d587 Merge remote-tracking branch 'tor-github/pr/559' 7 lat temu
relay 6e7ff8cba0 Move the code that knows our tor version into a lowest-level lib 7 lat temu
rend ec93385cb2 Comment for rend_cache_failure in feature/rend/rendcache.c: "usuable" should be "usable" 7 lat temu
stats c4e29001c4 Fix a bug where we would crash on --version. 7 lat temu