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

[nickm at torproject.org]

commit 300e3bebd19b2686501d5400da1ca4a748027ba4
Merge: 0742b3872 82a7343b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 12:47:08 2018 -0400

    Merge branch 'ticket26494'

 .gitignore                                 |   2 +
 Makefile.am                                |   6 +-
 src/include.am                             |   1 +
 src/lib/container/.may_include             |   1 +
 src/lib/container/smartlist.c              | 290 -----------------------------
 src/lib/container/smartlist.h              | 207 +-------------------
 src/lib/log/.may_include                   |   2 +-
 src/lib/log/torlog.c                       |   6 +-
 src/lib/log/util_bug.c                     |   3 +-
 src/lib/smartlist_core/.may_include        |   7 +
 src/lib/smartlist_core/include.am          |  21 +++
 src/lib/smartlist_core/smartlist_core.c    | 234 +++++++++++++++++++++++
 src/lib/smartlist_core/smartlist_core.h    |  95 ++++++++++
 src/lib/smartlist_core/smartlist_foreach.h | 128 +++++++++++++
 src/lib/smartlist_core/smartlist_split.c   |  87 +++++++++
 src/lib/smartlist_core/smartlist_split.h   |  15 ++
 src/rust/build.rs                          |   1 +
 17 files changed, 606 insertions(+), 500 deletions(-)