[tor-commits] [tor/master] Merge branch 'bug27963_wallclock'

[nickm at torproject.org]

commit 084a5a13c713a4d14fd6a003d6b46278efa91f4d
Merge: be197339b 267b8d16b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:38:26 2018 -0400

    Merge branch 'bug27963_wallclock'

 changes/bug27963_timeradd        | 4 ++++
 src/lib/thread/.may_include      | 1 +
 src/lib/thread/compat_pthreads.c | 1 +
 3 files changed, 6 insertions(+)