From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 Apr 2018 00:01:09 +0000 (-0400)
Subject: Merge branch 'remove_old_consensus_methods_2018_squashed'
X-Git-Tag: tor-0.3.4.1-alpha~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e8ae82a8757fb8bb2850f1a3d59ad1dfb468556;p=thirdparty%2Ftor.git

Merge branch 'remove_old_consensus_methods_2018_squashed'
---

0e8ae82a8757fb8bb2850f1a3d59ad1dfb468556