commit ba405f86bf33ed0e6c9552b3d9aad87bb79c1237 Merge: db95a6e 2210b33 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 25 08:12:59 2017 -0400

Merge branch 'ahf_prop278_21662_squashed'

Makefile.am | 2 +- configure.ac | 64 +++++ src/common/Makefile.nmake | 4 +- src/common/compress.c | 377 +++++++++++++++++++++++++ src/common/compress.h | 83 ++++++ src/common/compress_lzma.c | 605 ++++++++++++++++++++++++++++++++++++++++ src/common/compress_lzma.h | 51 ++++ src/common/compress_zlib.c | 546 ++++++++++++++++++++++++++++++++++++ src/common/compress_zlib.h | 51 ++++ src/common/compress_zstd.c | 609 +++++++++++++++++++++++++++++++++++++++++ src/common/compress_zstd.h | 51 ++++ src/common/include.am | 10 +- src/common/torgzip.c | 584 --------------------------------------- src/common/torgzip.h | 72 ----- src/or/buffers.c | 24 +- src/or/buffers.h | 4 +- src/or/circuitlist.c | 8 +- src/or/config.c | 20 +- src/or/connection.c | 8 +- src/or/connection.h | 10 +- src/or/directory.c | 38 +-- src/or/directory.h | 2 +- src/or/dirserv.c | 27 +- src/or/include.am | 6 +- src/or/main.c | 10 +- src/or/or.h | 6 +- src/or/relay.c | 3 +- src/test/fuzz/include.am | 4 +- src/test/include.am | 16 +- src/test/test.c | 2 +- src/test/test_buffers.c | 45 +-- src/test/test_dir_handle_get.c | 6 +- src/test/test_util.c | 339 +++++++++++++++++++---- 33 files changed, 2870 insertions(+), 817 deletions(-)