Merge branch 'bug18761_028_squashed' into maint-0.2.8
commit28e1aa111803bc3548e00503ab56de5f3d41c7fc
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:36:27 +0000 (11 12:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:36:27 +0000 (11 12:36 -0400)
treeeafb1174794d90bc094f05562ec1232b534421b1
parente71dfb6344c0480523a1fef0a77bd3d270d62e26
parentb59d79134e1089d310278a70788401835c1e5c10
Merge branch 'bug18761_028_squashed' into maint-0.2.8