Merge remote-tracking branch 'yawning/feature15482_fixup'
commitfa89eb60e952b964147bddd8d40e503e6872a291
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Sep 2015 13:56:59 +0000 (9 09:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Sep 2015 13:56:59 +0000 (9 09:56 -0400)
tree0911ad37ee8a4394334cfcb4ffc539ffcfa68cdf
parent2f8c0584bf3fa960f2cd1f63f57e5e908699cd1f
parentf6c446db47cb7dd08b1098312bf05f1442b8bb19
Merge remote-tracking branch 'yawning/feature15482_fixup'