Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
commit27cefef3a21e69d801c30d1450399b7d034c0f20
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 18:18:33 +0000 (3 13:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 18:18:33 +0000 (3 13:18 -0500)
tree116739a8a3be1b994a9aa9fefc2afca8f715efa3
parentbb5f99d4dfe119f82556ba4d9385d667a8414935
parent5c09431cc7c3843a26b2fcc8e52f56f3bba8abb6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
src/common/compat.h