Merge branch 'maint-0.3.3' into maint-0.3.4
commita4930de5e96b83295478386cd15c8a7a3e8c0ef8
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:40 +0000 (7 08:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:40 +0000 (7 08:44 -0400)
tree40bdd22c32ed6ba2adc7ef5acafce866cf1fc4d7
parentb6de39e5f465259b78d3886e0231d3dfef58fc1f
parentdf18cf0e8fa9195df82bef9535f920ad913efab7
Merge branch 'maint-0.3.3' into maint-0.3.4
src/or/rendclient.c