Merge branch 'bug1094_v2'
commit4504640b101fbbc88632f7f5efb923b801391052
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Aug 2010 15:11:02 +0000 (2 11:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Aug 2010 15:11:02 +0000 (2 11:11 -0400)
treed7c2654a7dfa17964f755bc2f984bd3046ead18a
parent1470eb2e91d6d9b986b6abb37fe9dc0d2f0b7ceb
parent49b0eb7a329224e53c3e24192a59e7c89d7e4ea4
Merge branch 'bug1094_v2'