]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Apr 2015 18:46:53 +0000 (14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Apr 2015 18:46:53 +0000 (14:46 -0400)
commit7286a27cfc74ca81ed71a8579ded95b25564708a
tree11a7f0b008216c05747d30b272cda6c6afa2f2b7
parent6ed57331695bee98f408d99c60684aaadcfe9a43
parent26c344a563610fcd293cd82bbb0b08dce737e5f3
Merge remote-tracking branch 'origin/maint-0.2.6'