]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2016 17:53:53 +0000 (13:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2016 17:53:53 +0000 (13:53 -0400)
commit52a99cb6c1e7cbcc33ed9dfd09fdcb7680f7d29b
treec3ae091f947a933d37b1ec8853fa76e7e0733cff
parent742ff2cddbb9676262e1b588206c3ae264f269b8
parente4d82da05b11a78da4858050b6d1e8d922842ca3
Merge branch 'maint-0.2.5' into maint-0.2.6