Nick Mathewson 2f0e187191 Merge remote-tracking branch 'tor-github/pr/627'		2019-01-09 15:46:14 -05:00
..
api	Re-order includes to expose intptr_t to tor_api_internal.h	2018-09-14 07:11:37 -04:00
client	Merge branch 'maint-0.3.5'	2019-01-09 09:35:40 -05:00
control	Merge remote-tracking branch 'tor-github/pr/627'	2019-01-09 15:46:14 -05:00
dirauth	Merge remote-tracking branch 'public/prop298'	2018-12-05 09:43:03 -05:00
dircache	Merge branch 'bug28591_035_squashed'	2019-01-09 09:33:31 -05:00
dirclient	Avoid mmap leak if we get a consensus diff we can't use.	2018-11-02 13:30:55 -04:00
dircommon	Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge	2018-10-31 09:04:12 -04:00
dirparse	Merge branch 'ticket28856_v2'	2019-01-09 08:46:40 -05:00
hibernate	Turn second_elapsed_callback into a normal periodic event.	2018-11-15 11:17:22 -05:00
hs	Merge branch 'maint-0.3.5'	2018-12-05 10:25:12 -05:00
hs_common	Fix revision counter bugs caused by bad SRV start time computation.	2018-08-22 18:09:47 +03:00
keymgt	Move key-loading and crosscert-checking out of feature/relay	2018-09-25 15:14:57 -04:00
nodelist	Merge branch 'bug28591_035_squashed'	2019-01-09 09:33:31 -05:00
relay	Merge branch 'maint-0.3.5'	2019-01-03 21:34:43 -05:00
rend	Comment for rend_cache_failure in feature/rend/rendcache.c: "usuable" should be "usable"	2018-11-13 10:33:51 -05:00
stats	Move buffers.c out of lib/containers to resolve a circularity.	2018-11-14 16:07:03 -05:00