From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Oct 2016 18:51:06 +0000 (-0400)
Subject: Merge branch 'buf_sentinel_026_v2' into maint-0.2.8
X-Git-Tag: tor-0.2.8.9~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1df114330e6c11865f0283772395ef02359ba5a0;p=thirdparty%2Ftor.git

Merge branch 'buf_sentinel_026_v2' into maint-0.2.8
---

1df114330e6c11865f0283772395ef02359ba5a0