Merge branch 'maint-0.2.9'
commit2dc522664420163eeea87b8a5bdab5eaabd9b2e2
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:31:19 +0000 (19 07:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:31:19 +0000 (19 07:31 -0500)
tree89e831e0b1f64b7af604f081d0d042415edaca77
parentae89d9745d3a0d0b2fdf333bd3299d1654bf7b39
parent169a93fff2510cf0eae76cdd198c19687bb1e875
Merge branch 'maint-0.2.9'