commit 0a43134009a431ecd734a4c122d5de0d63529800 Merge: 115cefd c6f2ae5 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 09:20:13 2017 -0500

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.