From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 May 2016 20:01:35 +0000 (-0400)
Subject: Merge branch 'link_ftrapv_clang32'
X-Git-Tag: tor-0.2.9.1-alpha~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=649785d464371f295405ced647b7b10f59053330;p=thirdparty%2Ftor.git

Merge branch 'link_ftrapv_clang32'
---

649785d464371f295405ced647b7b10f59053330