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

[sebastian at torproject.org]

commit a913f039edaa066fa30b05b50246ff5d945e73ce
Merge: c147121 6bfcba9
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Feb 11 18:32:04 2015 +0100

    Merge branch 'staging'

 docs/en/debian.wml |  238 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 231 insertions(+), 7 deletions(-)