]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 15:10:20 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 15:10:20 +0000 (11:10 -0400)
commit6382cd93cb99d1f5cff62bfe7759eca8a6948782
treedb86f11cd30f2fa8314fc60bfd464ebcc3940dca
parent49c83dd21a7fe0432ad78061f3b41f4a5919340d
parentd6a2fec05ebcc39773a2f6666e1378410c64f047
Merge branch 'maint-0.2.8'
src/or/circuitbuild.c
src/or/circuituse.c
src/or/config.c
src/or/control.c
src/or/dirserv.c
src/or/main.c
src/or/rephist.c
src/test/test_dir.c