Merge branch 'maint-0.2.4' into release-0.2.4
commit7bb4422a93eb347a944a25e1451c882e3060d5cb
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:47:36 +0000 (7 09:47 -0800)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Jan 2016 17:47:36 +0000 (7 09:47 -0800)
tree93d8fefff3ea30268b73f611d9abb521a189e7a3
parenta378b2239454bd66860094bacc693e88637d6dfe
parent11f63d26acb8ca872d894fb1423b380dc1f8dc2e
Merge branch 'maint-0.2.4' into release-0.2.4