Merge pull request #1052 from martin-frbg/locking
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 9 Jan 2017 08:22:58 +0000 (16:22 +0800)
committerGitHub <noreply@github.com>
Mon, 9 Jan 2017 08:22:58 +0000 (16:22 +0800)
Fix thread data races detected by helgrind 3.12


Trivial merge