Merge commit 'public/warn1125'
commitbf8d66364fed39113d0ca953c55c10b9f5f34703
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Aug 2010 04:27:05 +0000 (16 00:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Aug 2010 04:27:05 +0000 (16 00:27 -0400)
tree50d2fd480236577439fe4a4a4202fb9a6719d497
parent15379a7254a5d17ab9a2057435a6daa9c08ae880
parent8150e2ad245e9d2dbfb35ae53384424efd749890
Merge commit 'public/warn1125'