]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Oct 2017 13:28:29 +0000 (09:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Oct 2017 13:28:29 +0000 (09:28 -0400)
commit151d5ededf9fb334a5195904945f95cf626f51bc
tree69e0c607a26c11cd00f1abb305a901b927e473d5
parent46091a88ca6c3dd80c5a36e515d979930c1cdec1
parentfaf568fa7e8cfbebc236b6aef743251b7e6b9df4
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump