Merge branch 'bug2097' into maint-0.2.2
commitc2323f1340449d135ce698631cefbd1e546a9fe3
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Oct 2010 17:45:53 +0000 (20 13:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Oct 2010 17:45:53 +0000 (20 13:45 -0400)
tree9300ac51608137f8a104db61514a8287380da683
parent4f0badf974e05360d57926ddbd73677e5d3a5557
parent98aee8472f8028260f85b69499fa892060c9534c
Merge branch 'bug2097' into maint-0.2.2