Merge branch 'bug4457_022' into maint-0.2.2
commit5a02406ae0d8059d3b0bbff51d37fcb92650274b
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Nov 2011 21:22:47 +0000 (16 16:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Nov 2011 21:22:47 +0000 (16 16:22 -0500)
tree00528f0d4a2b5066a3ac50125ca41e25fdccff89
parent5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed
parent0f6c02161793fa1022fe721ed9c1aac3538294b3
Merge branch 'bug4457_022' into maint-0.2.2