]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Apr 2017 13:43:23 +0000 (09:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Apr 2017 13:43:23 +0000 (09:43 -0400)
1  2 
src/or/hs_service.c
src/or/hs_service.h

Simple merge
Simple merge