Merge branch 'bug18668_028' into maint-0.2.8
commit36b2b483082eeb43e2aac80cf72b36b35cb48473
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 20:58:43 +0000 (25 16:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 20:58:43 +0000 (25 16:58 -0400)
treea69dde3ce1d855e24ccaace99d14dac6d01b5423
parentf2d614c3d93aceac4954f7cd593213a5fcfbb123
parent0f9b0b8bfeb861d95c3872525c4a03e77675ccbd
Merge branch 'bug18668_028' into maint-0.2.8