]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Nov 2016 17:05:33 +0000 (13:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Nov 2016 17:05:33 +0000 (13:05 -0400)
commit733b2452836dffdf6fbb64c77fd168e24f278d55
tree4c57ead5ad6638813d8e503f9c07905d4afe458e
parent9248466f0a020e661cad185fc8eec28a18aca36c
parent3158777d35d8e03fdd77d9c227c2d04538d5fff3
Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9