]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:29 +0000 (10:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:29 +0000 (10:48 -0400)
commit7b7cb0d779ee3ea9ff9e1cd8682662c3d0ce6813
tree15d505dfc69f71a5db0f97ff7d59c07edf5032b6
parent8b1f88eded2b047eef9be9e16d6bf90b0f01bfd0
parent9d86f6665aaf3ef73bf93fd4f96dd861f894c5bd
Merge remote-tracking branch 'origin/maint-0.2.6'