Merge remote branch 'trondn/master'
authorNick Mathewson <nickm@torproject.org>
Wed, 27 Oct 2010 14:27:04 +0000 (10:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 27 Oct 2010 14:27:04 +0000 (10:27 -0400)

Trivial merge