commit c57e8da4ea9cccc168bb946040350434088cb7cb Merge: d0009cb a3fe8b1 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 20 12:58:26 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)