Merge branch 'jh/trace2'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:45 +0000 (10:50 -0700)
* jh/trace2:
trace2: fix tracing when NO_PTHREADS is defined

1  2 
trace2/tr2_tls.c
Simple merge