Merge branch 'maint-0.2.9' into maint-0.3.0
commit3bca705c544bd56ade5a25022b51d395f038444f
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Dec 2017 17:13:40 +0000 (1 12:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Dec 2017 17:13:40 +0000 (1 12:13 -0500)
treec4854219b325fcf1f6ed5c377ffb89de3f348dee
parent6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5
parent953a8f851081e6157e9296186c296ab10106b7eb
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/rendservice.c