Merge branch 'bug2511' into bug2510
commitcb101c48155729fa05cef2f255d1de0ad40d6b72
authorRoger Dingledine <arma@torproject.org>
Mon, 14 Mar 2011 19:52:53 +0000 (14 15:52 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 14 Mar 2011 19:52:53 +0000 (14 15:52 -0400)
tree5798ebe6e8c45dc206f8aec944568399216f6436
parent7d2a91f5e5aee77544115089ef79d14cb3e8093e
parent72b89c96bff877b5097c5e831d5469086d28c24c
Merge branch 'bug2511' into bug2510