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

[nickm at torproject.org]

commit 9c5ff56659fc0636adfd9f1448cc0167f53e7eec
Merge: a2192a6 e4a4224
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:21:10 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bifroest | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)