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

[nickm at torproject.org]

commit 865514e66ef6c99a53ae92b089d24a187513532d
Merge: f0bd6c2c9 1b75de85b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 13:19:24 2018 -0400

    Merge branch 'ticket28100_squashed'

 changes/ticket28100             |  3 +++
 src/feature/dircache/dircache.c | 14 ++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)