]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Sep 2014 15:58:08 +0000 (11:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Sep 2014 15:58:08 +0000 (11:58 -0400)
commite3c143f5214b4a2d37dbb47940eaf2cc2e212f86
tree9dc89abc6d5816ae8ced5764124b50238eadce2b
parent67c0ad54263be7fb742a8d499f97f5908f9ec970
parentefcab439564dcadc5bc14609a9205d73d236e966
Merge remote-tracking branch 'origin/maint-0.2.5'
src/or/connection.c
src/or/control.c
src/or/dirvote.c
src/or/rephist.c
src/or/routerparse.c