[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21123'

[nickm at torproject.org]

commit 730cc16b72db843cf40a6cb85d949b5d38fcb3c4
Merge: c7936b8 c83463e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:15:04 2017 -0500

    Merge remote-tracking branch 'teor/bug21123'

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