From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Feb 2017 21:25:25 +0000 (-0500)
Subject: Merge branch 'disable_memory_sentinels_squashed'
X-Git-Tag: tor-0.3.1.1-alpha~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f;p=thirdparty%2Ftor.git

Merge branch 'disable_memory_sentinels_squashed'
---

c0aa7ac5acd7b6f1d261a8a6eb5db2d3571e1f2f