]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.9' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 19:03:27 +0000 (15:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 19:03:27 +0000 (15:03 -0400)
commit559f79fd79b7c22caac2888f82e92307be02904a
tree47ffacb2d47ce8dbe0c9dfc997520190e31489ad
parent61a2762e353f29b8b4402bf068e6268809174702
parenta321d72401348cc3c8a5c3e86b2506c5c2278acd
Merge branch 'maint-0.2.9' into maint-0.3.2
src/or/config.c
src/or/dirserv.c
src/or/dirserv.h
src/or/dirvote.c
src/test/test_dir.c