Merge branch 'maint-0.2.6' into release-0.2.6
commitff1f6c417c53d905f47f26ea6b0fa90888857a8c
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 23:47:28 +0000 (9 19:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 23:47:28 +0000 (9 19:47 -0400)
treef6d219b7d1e5f134a5a71e69ee7892e4080cf74e
parent5e5b82febba1ca904abc59863115f0f4b325fdad
parent1af67d7f72470cec1de5e2a75186edc3b3accfbe
Merge branch 'maint-0.2.6' into release-0.2.6