Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
commit0575a182a633429e755dc4366eced76656461d9b
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 17:48:25 +0000 (29 13:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 17:48:25 +0000 (29 13:48 -0400)
treecf88f1492fbdcf320cd62f9bd168eb1bfd3338dd
parent216456299f5ce83aabef8dd7cb80f2b3d8acd484
parent2a1f8ea2e78486966c71762ebc3286f2b3e531ff
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
src/lib/log/util_bug.h