Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
commit0b9c515870f6444fb706590103618c9a2f67c47a
authorNick Mathewson <nickm@torproject.org>
Mon, 8 Jul 2013 13:22:00 +0000 (8 09:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 8 Jul 2013 13:22:00 +0000 (8 09:22 -0400)
treefeb57bab1a725fc9687a5dc45e8a035213231a42
parent60d633c73a71d9ba514d4250fe00da5173e9968a
parent2a61b0dd6be2eba9525b777dcb4400b93b695a2d
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3