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

[nickm at torproject.org]

commit 2c718c1a12f06bdaa9c735a8d201c20b7ca4cfac
Merge: bb5968c 0ac8f0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 10:43:50 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/diagnose_22752  | 4 ++++
 src/common/storagedir.c | 6 ++++--
 src/or/consdiffmgr.c    | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)