commit 52c40330c8ab0c43c5773349d033ff7e49f02f53 Merge: 67a5d4cb6 72ea4a8f0 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 11 13:49:20 2017 -0400

Merge branch 'maint-0.3.1'

src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-)