commit fd5d9d04b380b6dfee099273d729e2b7299198af
Merge: eda5ceb f785723
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 29 08:39:13 2014 -0500
    Merge remote-tracking branch 'rl1987/ticket13913'
 changes/bug13913 |    5 +++++
 doc/tor.1.txt    |    2 ++
 2 files changed, 7 insertions(+)