From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 May 2018 21:59:09 +0000 (-0400)
Subject: Merge branch 'contributing'
X-Git-Tag: tor-0.3.4.1-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbb13df8080b660e5d20962c31c8744ed190d2e9;p=thirdparty%2Ftor.git

Merge branch 'contributing'
---

cbb13df8080b660e5d20962c31c8744ed190d2e9