Merge branch 'mr/113'
commitd4f3cfe99a4c3ef3495a8f8848981f9b30cc8a34
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 25 Aug 2020 17:37:04 +0000 (25 20:37 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 25 Aug 2020 17:37:04 +0000 (25 20:37 +0300)
treef38c8af8720c9be4790466ed030e1ba8bb8867bb
parentcc4e42ee3257d5157172cedb73ed86ba88ca271d
parent75772ea096e030ecc79f67b1444cac42aaed7449
Merge branch 'mr/113'
src/core/or/channel.c
src/core/or/channel.h
src/core/or/channeltls.c
src/feature/relay/router.c