]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:42:56 +0000 (12:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:42:56 +0000 (12:42 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge