]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:57 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:57 +0000 (12:52 -0400)
commit938deecc876e110d708edda544d20d9fd752838e
tree9069aad92da78b718226abbea4e649c363885191
parentbb68c731b897a967a4b7eb138728fa077617646e
parentfa7ce6d3be62061de73176ffb939aa8d353d4014
Merge remote-tracking branch 'origin/maint-0.2.5'
doc/tor.1.txt