]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1880/head'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 May 2020 12:19:11 +0000 (08:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 May 2020 12:19:11 +0000 (08:19 -0400)
1  2 
src/core/or/channeltls.c
src/feature/dirclient/dirclient.c

Simple merge
Simple merge