]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket31343_040' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 15:23:59 +0000 (11:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 15:23:59 +0000 (11:23 -0400)
1  2 
src/core/or/channeltls.c
src/feature/nodelist/routerlist.c

Simple merge
Simple merge