]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 6 Jan 2020 18:24:01 +0000 (13:24 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 6 Jan 2020 18:24:01 +0000 (13:24 -0500)
1  2 
src/lib/confmgt/structvar.c
src/lib/log/util_bug.h

Simple merge
Simple merge