]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2013 15:20:45 +0000 (11:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2013 15:20:45 +0000 (11:20 -0400)
commitbeec881f92d25b4e85aa30be341d30fce54b2e50
tree3b9d0772eb1a6ead1f7f825775f082540026c149
parent4d7ac69f05ea80e0a79efe2af64dfe66d788e8df
parentc03cfc05468077d5db52ec660a2e7e3fb086a751
Merge remote-tracking branch 'origin/maint-0.2.4'
doc/tor.1.txt