[tor-commits] [snowflake/master] Merge branch 'letsencrypt'

[dcf at torproject.org]

commit 61b604fc46df7e43d8a6069e7c6c00204d46665d
Merge: 9f2e9a6 a936fc7
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 30 19:13:01 2017 -0700

    Merge branch 'letsencrypt'

 server/README.md |  62 ++++++++++++++++++++++++++++
 server/server.go | 122 +++++++++++++++++++++++++++++++++++++++----------------
 server/torrc     |  10 ++---
 3 files changed, 153 insertions(+), 41 deletions(-)