commit 00b78dee347837977dedd66afea6df3a86d20002 Merge: b186d19 cca1ed4 Author: David Fifield david@bamsoftware.com Date: Thu Jul 21 15:40:54 2016 -0700

Merge branch 'bug18371'

meek-client-torbrowser/linux.go | 5 +- meek-client-torbrowser/mac.go | 12 +- meek-client-torbrowser/meek-client-torbrowser.go | 148 ++++++++++++++++++++++- meek-client-torbrowser/windows.go | 5 +- 4 files changed, 158 insertions(+), 12 deletions(-)