Nick Mathewson 4bdba5fa4b Merge branch 'maint-0.3.4' 8 anni fa
..
api 88c9730817 Re-order includes to expose intptr_t to tor_api_internal.h 8 anni fa
client b943721b2a Merge branch 'bug27224_take2_squashed' 8 anni fa
control bb012d7941 Merge remote-tracking branch 'tor-github/pr/329' 8 anni fa
dirauth 94605f08fb Merge branch 'ticket27246_035_01_squashed' 8 anni fa
dircache 617160895c Defer reporting directory bootstrap progress 8 anni fa
dirclient ef486e3c02 Fix every include path changed in the previous commit (automated) 8 anni fa
dircommon e2b744ce38 Merge branch 'bug25552_ope_squashed' 8 anni fa
hibernate ef486e3c02 Fix every include path changed in the previous commit (automated) 8 anni fa
hs 4bdba5fa4b Merge branch 'maint-0.3.4' 8 anni fa
hs_common 5febea0d54 Fix revision counter bugs caused by bad SRV start time computation. 8 anni fa
nodelist b67f3b751a Merge branch 'ticket27247' 8 anni fa
relay 0db5c54957 Merge branch 'nss_squashed' into nss_merge 8 anni fa
rend 33c99cf565 hs-v2: Demote log warning to info when we don't have a consensus 8 anni fa
stats 83b8a76f0c Fix a shadowed-global warning in geoip.c 8 anni fa