commit cf2ac8e2556849fdcace74adf36da876f86af30a Merge: 6f7a8f8 734ba5c Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 6 13:52:54 2015 -0500

Merge remote-tracking branch 'public/feature11791'

changes/bug11791 | 4 ++++ src/common/torgzip.c | 50 ++++++++++++++++++++++++++++++++++++----------- src/common/torgzip.h | 12 +++++++++++- src/or/config.c | 1 + src/or/directory.c | 33 ++++++++++++++++++++++++++----- src/or/dirserv.c | 2 +- src/or/or.h | 2 ++ src/or/relay.c | 24 ++++++++++++++++++++--- src/or/relay.h | 2 ++ src/test/test_buffers.c | 4 ++-- src/test/test_util.c | 2 +- 11 files changed, 112 insertions(+), 24 deletions(-)