]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2164562 2a1f8ea)
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 17:48:25 +0000 (13:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 17:48:25 +0000 (13:48 -0400)
1  2 
src/lib/log/util_bug.h patch | diff1 | diff2 | blob | history

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