From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Jan 2020 21:02:41 +0000 (-0500)
Subject: Merge branch 'disable_ns_macro'
X-Git-Tag: tor-0.4.3.1-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5888db496746e2fef344c40912ff07be8a216f9c;p=thirdparty%2Ftor.git

Merge branch 'disable_ns_macro'
---

5888db496746e2fef344c40912ff07be8a216f9c