From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Feb 2017 14:20:13 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.13~12^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a43134009a431ecd734a4c122d5de0d63529800;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.6' into maint-0.2.7

This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.
---

0a43134009a431ecd734a4c122d5de0d63529800