Merge remote branch 'sebastian/continuation'
commiteb0a07507fc7f7e36e86a4293817cdf3d52e630f
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 17:43:55 +0000 (24 13:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 17:43:55 +0000 (24 13:43 -0400)
tree5f54e06e0dcf92db95b23e72c6209066e25be5a6
parentc9a91c31ac912d07f7697ec0693c98b65c32959e
parent6394ca6451e38d4b277c26fec366b4f1e9207bba
Merge remote branch 'sebastian/continuation'