From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Dec 2017 14:15:30 +0000 (-0500)
Subject: Merge branch 'xfer_time_coarse'
X-Git-Tag: tor-0.3.3.1-alpha~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69a320ce5d84308c8749e9311ad6888d5aae5d3b;p=thirdparty%2Ftor.git

Merge branch 'xfer_time_coarse'
---

69a320ce5d84308c8749e9311ad6888d5aae5d3b