[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit a6eaa121e47625f9e9195b87c18f85d1307ee409
Merge: df87812 1d91bf5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 08:06:19 2016 -0500

    Merge branch 'maint-0.2.9'

 src/common/compat_time.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)