commit bcba6a4918b43863d2ac70833aff6128231d5f22 Merge: 17d8ccefc 67abf55d6 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 6 15:17:52 2018 -0500

Merge branch 'maint-0.3.5'

changes/bug28303 | 3 +++ src/lib/encoding/time_fmt.c | 4 ++++ src/lib/evloop/timers.c | 4 ++++ 3 files changed, 11 insertions(+)