commit 1e3f52ef04fcb7eb15d0b76509fdc3f6dcec6377 Merge: fc2ccfb 4941ad1 Author: Sebastian Hahn sebastian@torproject.org Date: Wed Dec 3 03:16:45 2014 +0100

Merge branch 'master' into staging

include/mirrors-table.wmi | 512 +++++++++++++++++++++++++-------------------- include/tor-mirrors.csv | 156 +++++++------- 2 files changed, 368 insertions(+), 300 deletions(-)