Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
commitedb6acf9cee42406cfa8380c898b7b664f699b8d
authorNick Mathewson <nickm@torproject.org>
Thu, 10 May 2018 13:19:09 +0000 (10 09:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 May 2018 13:19:09 +0000 (10 09:19 -0400)
tree453ae6a01e57fa0278b8abac48de887d86307db7
parentbca8a104b291c0f475c87905e0dc958978776ecb
parentdbdde76f56d0ecb2ef03ac6ec231151016ffbd88
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9