commit 4c7a89a226be2f75400f3fc22d19ec9c31acd891 Merge: 0f6bbbc74 ad814cad4 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 21 10:58:06 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug23607'

changes/bug23606 | 4 ++++ changes/bug23607 | 4 ++++ src/or/statefile.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-)