commit d19cbf3ab17a5afcbe0e94a16686e9ff9129dbfc Merge: 962765a dcb4ee5 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 2 19:00:00 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.5'

doc/tor.1.txt | 5 +++++ 1 file changed, 5 insertions(+)