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

[nickm at torproject.org]

commit 559195ea82bf1c0610898fd96cd5a835b2e4f9a7
Merge: 733ce55 2cd49d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 18:28:38 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22702     |  5 +++++
 src/or/consdiffmgr.c | 18 ++++++++++++++++++
 src/or/consdiffmgr.h |  3 +++
 src/or/directory.c   | 31 +++++++++++++++++++++++++++++++
 src/or/dirserv.c     |  6 ++++++
 5 files changed, 63 insertions(+)