commit 4d97efd4d1cdc39e42fd0aeaeeee9accfeb15785 Merge: a7aeb6f58 948be49ce Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 4 15:48:01 2017 -0400

Merge branch 'bug22752_031_simple' into 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(-)