commit 4d4e2fc22489fcbc2427a3275f6b95cfe4e9ccdd Merge: 6108499c9 72ea4a8f0 Author: Nick Mathewson <[email protected]> Date: Mon Sep 11 13:49:12 2017 -0400
Merge branch 'maint-0.3.1' into release-0.3.1
src/common/timers.c | 26 ++++++++++++++++++--------
src/common/timers.h | 4 ++++
2 files changed, 22 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
