[SCM] branch, master, updated. 3bf34070616439cb201faf0cb1a918bf018ae5c3

[Daniel Kahn Gillmor]

The following commit has been merged in the master branch:
commit 86da580b29d225e3b676c8730227247ae4853fe5
Merge: 077aaa83af589025f7cd6c5199e11a6813b485bb 5437643fd58eeff36d2ec6d638616dac3c611568
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Dec 20 20:13:41 2012 -0500

    Merge tag 'upstream/0.17'
    
    Upstream version 0.17


--