commit 1cf970c3dbbdbdf2b2fb162bbeeb6890e9b6c5c4 Merge: e30a431 31ed10f Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 14:24:17 2012 -0400

Merge remote-tracking branch 'asn/bug5540'

doc/state-contents.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)