]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:05:59 +0000 (14:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:05:59 +0000 (14:05 -0400)
commiteb92d11f53dd2245f4cfd618bde3996e76b498cf
tree1384ca96bff38a12127b609f126b7a2a666d1d61
parent95a88f72832d9385ef8e4199d29f8f46090a4584
parent1a7af7470fdd6173f1b876fc6fee2b171174b4ff
Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bump.