]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.9' into maint-0.3.0 maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:43 +0000 (16:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:43 +0000 (16:29 -0500)
commitb39c50cde8b1d7e3e27d5a6fc2e58ff208982637
treeb5488c46140a852b13323ae8edc9bc54ffe1dbf9
parent1cf11b69408ab3707de01711308a05e223a767f5
parenta2aaf9509ba578f4e7705b506ee9a0f764d24ff2
Merge branch 'maint-0.2.9' into maint-0.3.0

 Conflicts:
        src/or/rendservice.c
src/or/rendservice.c