]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 15:12:34 +0000 (10:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 15:12:34 +0000 (10:12 -0500)
commit8f043ffc647bf129e8a6d0c5991586fac880c489
treeabbeb7c8db93f08728226b7da3123dceeb7cf53c
parent24318fbda99d7fb316e1c377fedaeba927102145
parentf62c74cc7298aa9a7db55f1256754b8e243e3865
Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid version bump.