]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:40 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:40 +0000 (12:52 -0400)
commitfa7ce6d3be62061de73176ffb939aa8d353d4014
tree1b24dad14a48fa2b2eafe3c579028a46c4891cbe
parent4056c61608f1ede0da56559cb7e56ec2087dc659
parentb45f0f8fb9b11effcd48159c078f09a3fbc04b11
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
doc/tor.1.txt