Merge branch 'feature/tor-0.2.4' into devel0.20.1-rc1
commit99e7b35eb63e554dce008737b1d4c92fb1176d73
authorTails developers <amnesia@boum.org>
Mon, 9 Sep 2013 11:11:44 +0000 (9 11:11 +0000)
committerTails developers <amnesia@boum.org>
Mon, 9 Sep 2013 11:11:44 +0000 (9 11:11 +0000)
tree4a9d76d3bbd42e4106b2df7cc36f9e04a0484132
parent186bd2ec25a3c6aaee3f666c5853af247d0642fc
parent031c94382692d3902bdd4dbb13a9f864d2122889
Merge branch 'feature/tor-0.2.4' into devel
wiki/src/contribute/design.mdwn