Merge commit 'sjmurdoch/xxx-using-spdy'
commitd1057f95aa7bfc2d6f12cdccb52bc000d30c9d5a
authorNick Mathewson <nickm@torproject.org>
Fri, 11 Jun 2010 17:25:38 +0000 (11 13:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 11 Jun 2010 17:25:38 +0000 (11 13:25 -0400)
tree98661ccdac7c70125d50a637c83f06af911ff375
parentea7bb5494051c0e9510ce841d99b763aaf701cba
parent2b1ac338e788198597703541e3a6fec998645338
Merge commit 'sjmurdoch/xxx-using-spdy'