Merge commit 'arma/dotexit'
commitd59338f2966063f746ab3999eedb98ab9130604a
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2009 01:48:08 +0000 (9 18:48 -0700)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2009 01:48:08 +0000 (9 18:48 -0700)
treeae3be91cd93114a9664a2f5c494ecff9e0d00cf6
parentea3369b2f8b3f72e0ffc0426276373c8cbf28821
parentfd290e6650e8c44a695ac21009d02ab44f98b647
Merge commit 'arma/dotexit'