Merge remote-tracking branch 'yawning/bug16674'
commit58758e713f69a6ce2c66367d8524df578520a036
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Jul 2015 13:15:52 +0000 (27 09:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Jul 2015 13:15:52 +0000 (27 09:15 -0400)
tree8a86948b136e628676b6c59a4fcb9f3b7c2f349b
parentc0106118fadb35e22fdbb038c3dfac2a89f816de
parentda6aa7bfa5014b980a93b38024d16b32720dc67a
Merge remote-tracking branch 'yawning/bug16674'