]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Oct 2011 20:49:52 +0000 (16:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Oct 2011 20:49:59 +0000 (16:49 -0400)
commit19f1d3e331dfa34ab78d9bb90c61674e49ceae52
tree6612e36f5a3c437278535e5f54a753d8d1b6a765
parent1ec22eac4bf20424624fe2ef2151ff57687912de
parentf37d24c550a0d8512249f77262c01960af6ed31b
Merge remote-tracking branch 'origin/maint-0.2.2'

This merge is here to take a commit (feature 3951) that we already
have in master, so use "merge -s ours"