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

[nickm at torproject.org]

commit 72d9e057c37bde3f735961b62ed7dc42adcb48ba
Merge: 9203b3e b9ef21c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:21:13 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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