Merge branch 'bug19161_028_v2' into maint-0.2.8
commit6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:17:26 +0000 (25 10:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:17:26 +0000 (25 10:17 -0400)
treed74122a462733613876260bd945fffcb1ba548db
parentfdfc528f85c11a1d29b6a67e32180278d1ca7cbb
parentbe3875cda2c45d8cd057c00e0bcc16bef9067d90
Merge branch 'bug19161_028_v2' into maint-0.2.8