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

[nickm at torproject.org]

commit 9d34a1e0523f79ef8297b7940bbb2e6be9660f5c
Merge: 4c2ad48 5567a80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 11:49:00 2017 -0400

    Merge branch 'storage_labeled_squashed'

 src/common/confline.c      | 320 ++++++++++++++++++++++++++++
 src/common/confline.h      |  47 +++++
 src/common/include.am      |   2 +
 src/common/storagedir.c    | 146 +++++++++++--
 src/common/storagedir.h    |  15 +-
 src/common/util.c          | 131 ------------
 src/common/util.h          |   3 -
 src/or/confparse.c         | 176 ----------------
 src/or/confparse.h         |   9 -
 src/or/conscache.c         | 506 +++++++++++++++++++++++++++++++++++++++++++++
 src/or/conscache.h         |  52 +++++
 src/or/include.am          |   2 +
 src/or/or.h                |  22 +-
 src/test/include.am        |   1 +
 src/test/test.c            |   1 +
 src/test/test.h            |   1 +
 src/test/test_conscache.c  | 341 ++++++++++++++++++++++++++++++
 src/test/test_storagedir.c | 105 ++++++++++
 18 files changed, 1527 insertions(+), 353 deletions(-)