[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit c515fbc7327ce1189c0b511265b2bd6b452003e3
Merge: 3a5cf9aa2 4d97efd4d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 15:48:12 2017 -0400

    Merge branch 'maint-0.3.1' into release-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(-)