]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3778b97 db32952)
Merge branch 'tor-github/pr/1377'
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 3 Oct 2019 16:13:57 +0000 (19:13 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 3 Oct 2019 16:13:57 +0000 (19:13 +0300)
1  2 
src/lib/log/log.c patch | diff1 | diff2 | blob | history
src/lib/log/log.h patch | diff1 | diff2 | blob | history
src/test/test_options.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/log/log.c
Simple merge
diff --cc src/lib/log/log.h
Simple merge
diff --cc src/test/test_options.c
Simple merge
Mirror of https://git.torproject.org/tor.git