[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/bug13213'

[nickm at torproject.org]

commit dc019b06548e49ce4ea2a1501715985b648f2606
Merge: 56f92ca fa60a64
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 29 08:57:19 2014 -0400

    Merge remote-tracking branch 'yawning/bug13213'

 changes/bug13213 |    4 ++++
 src/or/config.c  |   32 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)