Merge remote-tracking branch 'andrea/bug8625_prod'
commit06e82084d6829084a43453e2b810d45c4e794259
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 16:44:06 +0000 (12 12:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 16:44:06 +0000 (12 12:44 -0400)
tree419403d74261e6b821a092c0639057bd8af9217f
parenta7e317927b9901a5b1d1d8de010093816da76425
parentab8679f2fd3bb9ff7de093bf0bd42bff1a87d6aa
Merge remote-tracking branch 'andrea/bug8625_prod'