[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

commit 535e03400419340c3bed2af5fa810308727293c5 Merge: 56451e8 c6f2ae5 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 7 09:21:15 2017 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)