[tor-commits] [webwml/staging] Merge branch 'master' into staging

23 Jul 2015


      commit 8c03c2497a62d138abc2d7889c7e678147dfc72f
Merge: f594383 6c54d65
Author: Sebastian Hahn <sebastian@torproject.org>
Date:   Mon Jul 20 18:00:47 2015 +0200

    Merge branch 'master' into staging

[tor-commits] [webwml/staging] Merge branch 'master' into staging

sebastian＠torproject.org