[tor-commits] [tor/master] Merge branch 'atomic_counters'

[nickm at torproject.org]

commit 232c9e14a8319040c59fd9da1b5d242a57d10a04
Merge: ec7c512 4266ec7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 25 10:46:23 2017 -0400

    Merge branch 'atomic_counters'

 src/common/compat_threads.c    | 45 ++++++++++++++++++++++++++++++++++++++++++
 src/common/compat_threads.h    | 14 +++++++++++++
 src/common/compress.c          |  8 ++++++++
 src/common/compress.h          |  2 ++
 src/common/compress_lzma.c     | 13 +++++++++---
 src/common/compress_lzma.h     |  2 ++
 src/common/compress_zlib.c     | 14 +++++++++----
 src/common/compress_zlib.h     |  2 ++
 src/common/compress_zstd.c     | 13 +++++++++---
 src/common/compress_zstd.h     |  2 ++
 src/or/main.c                  |  1 +
 src/test/bench.c               |  1 +
 src/test/fuzz/fuzzing_common.c |  1 +
 src/test/testing_common.c      |  1 +
 14 files changed, 109 insertions(+), 10 deletions(-)