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

[nickm at torproject.org]

commit dcc0a49a8477a33ba6b90839ae152230f0eac692
Merge: 480dab4 531835f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 28 11:04:49 2017 -0400

    Merge branch 'ticket21648'

 changes/bug22096            |   6 +
 src/common/sandbox.c        |   2 +-
 src/common/storagedir.c     |  21 ++-
 src/common/storagedir.h     |   1 +
 src/or/config.c             |  10 +
 src/or/conscache.c          |  40 +++-
 src/or/conscache.h          |   7 +-
 src/or/consdiffmgr.c        | 439 +++++++++++++++++++++++++++++++++++---------
 src/or/consdiffmgr.h        |   8 +-
 src/or/main.c               |  23 +++
 src/or/networkstatus.c      |   4 +
 src/test/test_conscache.c   |   2 +-
 src/test/test_consdiffmgr.c |  26 +--
 13 files changed, 477 insertions(+), 112 deletions(-)