commit 10a4f9cd0745cbcb1a9018304dad2dd5edbee1f2 Merge: 49deb1e 2903c32 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 27 11:31:31 2017 -0400

Merge branch 'parse_accept_encoding'

src/common/compress.c | 20 ++++++++++++++ src/common/compress.h | 5 ++-- src/or/directory.c | 62 ++++++++++++++++++++++++++++++++++-------- src/or/directory.h | 1 + src/test/test_dir_handle_get.c | 47 ++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 13 deletions(-)