]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.1'
authorNick Mathewson <nickm@torproject.org>
Tue, 27 Jun 2017 22:28:38 +0000 (18:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 27 Jun 2017 22:28:38 +0000 (18:28 -0400)
1  2 
src/or/directory.c
src/or/dirserv.c

Simple merge
Simple merge