]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Jun 2013 05:45:35 +0000 (01:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Jun 2013 05:45:35 +0000 (01:45 -0400)
commit82fea1b0dffe2cb808e997b891106651d6a7bb97
treeb372abd590396a719461ac9a4da8872ea30fb46d
parent72f775e18416300bd230f5784dc779db6138537b
parentd780cd5fd428176ebf4a72610ec4066c18346c09
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Using "ours" strategy to avoid taking changes.