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

[nickm at torproject.org]

commit 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8
Merge: 32eba3d 09ae4fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 18:28:34 2017 -0400

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