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

[nickm at torproject.org]

commit dae12425328f1ba69498d5dec5ce747af7e19013
Merge: ec6b2bb 9e3f304
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 15 17:22:12 2017 -0400

    Merge branch 'ahf_bugs_21667_2_squashed'

 src/common/compress.c          |  26 ++
 src/common/compress.h          |   1 +
 src/or/consdiffmgr.c           | 621 ++++++++++++++++++++++++++++++++++-------
 src/or/consdiffmgr.h           |  18 ++
 src/or/directory.c             | 381 +++++++++++++++++--------
 src/or/directory.h             |   1 +
 src/or/dirserv.c               |  12 +-
 src/or/main.c                  |   1 +
 src/or/networkstatus.c         |  18 +-
 src/or/networkstatus.h         |   4 +-
 src/or/or.h                    |   4 +-
 src/test/test_consdiffmgr.c    |   6 +-
 src/test/test_dir_handle_get.c |  71 +++--
 13 files changed, 899 insertions(+), 265 deletions(-)