]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 01:09:22 +0000 (21:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 27 May 2016 01:09:22 +0000 (21:09 -0400)
commita93b6bbf17f8940a2b5cb9faad2ee054c85297c1
tree3611e2bc47cf25f8b8d2c921d9c8406841496d7e
parent02383ea7ea9a5c1e9d63e9857daff961d9146ec5
parentf25806409d34ab675e01a30347b4995c741a6287
Merge branch 'maint-0.2.8'

(This is an "ours" merge to avoid taking the version bump)