Nick Mathewson bb091da1e7 Merge branch 'ticket28839_v2_squashed'

2018-12-18 18:59:05 -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 'ticket28179_squashed' into ticket28179_squashed_merged

2018-12-17 16:41:01 -05:00

control

Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged

2018-12-17 16:41:01 -05:00

dirauth

Merge remote-tracking branch 'public/prop298'

2018-12-05 09:43:03 -05:00

dircache

Merge remote-tracking branch 'tor-github/pr/464'

2018-11-06 15:33:25 -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

Avoid a needless decode/re-encode step in assigning onion keys

2018-12-18 18:58:08 -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 remote-tracking branch 'github/prop297'

2018-12-11 09:44:57 -05:00

relay

Merge remote-tracking branch 'public/prop298'

2018-12-05 09:43:03 -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