]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5' into maint-0.2.6 maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)
commit6862eada65a6f41304b32c3d4fca3da9c240d5bd
tree31d4472bdda5a7c64f05dab5b13cd971be01656e
parentf794b40ec0056ae8642d995b3cbce04441ebe26e
parent0bfd1c318cdd468d2699714a36687e9cda16fabb
Merge branch 'maint-0.2.5' into maint-0.2.6