]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Sep 2014 23:00:00 +0000 (19:00 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Sep 2014 23:00:00 +0000 (19:00 -0400)
commitd19cbf3ab17a5afcbe0e94a16686e9ff9129dbfc
tree956a3ec5218fc706fafb940c67da187f9fb40cd5
parent962765a35de4a069aba58e9cf6edb726ca22b98e
parentdcb4ee5b83b69234ef8fd0fce8533ab1c4434bd9
Merge remote-tracking branch 'origin/maint-0.2.5'
doc/tor.1.txt