[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 42394053c97c32786f1c5505bc9f8aa2d0ca253f
Merge: 33989cd00 4d97efd4d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 15:48:12 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22752_simple |  6 ++++
 src/or/conscache.c      | 84 ++++++++++++++++++++++++++++++++++++++++++++++---
 src/or/conscache.h      |  1 +
 src/or/consdiffmgr.c    | 10 +++++-
 4 files changed, 95 insertions(+), 6 deletions(-)