[tor-commits] [tor/master] Merge branch 'bug27963_wallclock' into maint-0.3.5

[nickm at torproject.org]

commit a6c7e01584ae9e473e7fd9dd01d6e692a8e70e43
Merge: ff0516271 267b8d16b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:39:13 2018 -0400

    Merge branch 'bug27963_wallclock' into maint-0.3.5

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