]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 3 Aug 2020 13:48:52 +0000 (16:48 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 3 Aug 2020 13:48:52 +0000 (16:48 +0300)
1  2 
src/core/mainloop/connection.c
src/core/or/connection_st.h
src/feature/relay/ext_orport.c

Simple merge
Simple merge
Simple merge