Merge branch 'maint-0.2.9' into maint-0.3.2
commita5ed62f96cafa1be251f9a7b4aafa519de4c2645
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:39 +0000 (7 08:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:39 +0000 (7 08:44 -0400)
tree0d8127b923959622711c576a5dd5fb23b2f2422d
parenta08e6e711fbcd6a12818f1fe14739fc0e870434d
parent912ae2b8dc5d13344035def71c6e083a92752c09
Merge branch 'maint-0.2.9' into maint-0.3.2
src/or/rendclient.c