Merge branch 'bug18357_v2'
commitd2ab58c48dc351f7dc0828f3dc4159627218c75e
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Oct 2016 13:10:34 +0000 (14 09:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Oct 2016 13:10:34 +0000 (14 09:10 -0400)
tree16a5df78eb88388590fce7acb9446035443a8755
parent07f2e5748ec55f337adadc6eb1158fa53f126bfe
parent87865c8aca0cc8c7ad4d4696a75e96b91fdf8734
Merge branch 'bug18357_v2'