]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 18 Jun 2015 15:30:01 +0000 (11:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 18 Jun 2015 15:30:01 +0000 (11:30 -0400)
commitf18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e
treec946de86995f219151437d39703de4e0b67bc3d4
parentc8cb55659acca96530a1d7f54bb96cac84626e17
parent8acf5255c20c667f32313ee672c85f6ae00a4f87
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6