[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit efa5bbaba07d20d1aacff7d1d2a5fe08a6ec2d72
Merge: 9b1d990 823fb68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 17 11:47:49 2017 -0500

    Merge branch 'maint-0.3.0'

 changes/bug21492 | 5 +++++
 src/or/config.c  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)