]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug20716_026' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 17:00:46 +0000 (12:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 17:00:46 +0000 (12:00 -0500)
commit8b93cbc16d2ec0b64ce9d48482a2cf2164ed1199
tree40d7733c4b18e83132a0cc3313037d2ef56874a9
parent70d39859d63344ac7cce4f69cb6a7ad510a8cc32
parent3b6da3f90ccad60517f5b639d5340a7e6489be27
Merge branch 'bug20716_026' into maint-0.2.9
src/or/connection.c