aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-27 16:16:08 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-27 16:16:08 -0800
commit6727428f96106281b16433fa52c6e199348facda (patch)
treefcaf222de5e58ee713fa4599e256d5085b468dd6
parentf26582d5476a9a91a6ab646d755dcc96dcee33e4 (diff)
parent26cbd1a003906db1f0fbff2f7e5477ddbaaf3e47 (diff)
Merge github.com:grpc/grpc into asan2
-rw-r--r--tools/tsan_suppressions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/tsan_suppressions.txt b/tools/tsan_suppressions.txt
index 23d57f9fd1..fb7b85cbea 100644
--- a/tools/tsan_suppressions.txt
+++ b/tools/tsan_suppressions.txt
@@ -1,2 +1,4 @@
# OPENSSL_cleanse does racy access to a global
race:OPENSSL_cleanse
+race:cleanse_ctr
+