Merge remote-tracking branch 'public/bug9934_nm'
commit7578606a2265466bc4546f0d08b9dbdf427e7c1c
authorNick Mathewson <nickm@torproject.org>
Fri, 25 Oct 2013 16:15:31 +0000 (25 12:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 25 Oct 2013 16:15:31 +0000 (25 12:15 -0400)
tree46736ab14f3c6dd23b41c10c835c97386a0d783b
parentc95cc088c1188cfd887b849af1e2eb45131fd68e
parent71bd10097677cd035bd97a6c36b85d07fdbafb62
Merge remote-tracking branch 'public/bug9934_nm'