commit c3e3c6ca850d9c28091446eac009ae858bb0157f Merge: aab7d66 3879c10 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 11 10:24:28 2015 -0400 Merge remote-tracking branch 'teor/feature15817-clang-sanitizers' contrib/clang/sanitize_blacklist.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)