Public Git Hosting - tor/appveyor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c67addd 2bcd264)

commit	bd71e0a0c8ccf684c40201f08c456596eac60887
author	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 14:54:13 +0000 (16 09:54 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 14:54:13 +0000 (16 09:54 -0500)
tree	5b33cdf7ee6ad33cd95499cff7e4e53b56c1559f	tree \| snapshot (tar.gz zip)
parent	c67adddacb56f90d77786820f29ca2b4b9f91cae	commit \| diff
parent	2bcd264a28e2d6bec1e806e779bf82435c9c7505	commit \| diff

Merge branch 'maint-0.3.1' into maint-0.3.2

25 files changed:

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/common/address.c	diff1 \|	diff2 \|	blob \| history
src/common/address.h	diff1 \|	diff2 \|	blob \| history
src/common/include.am	diff1 \|	diff2 \|	blob \| history
src/common/log.c	diff1 \|	diff2 \|	blob \| history
src/common/torlog.h	diff1 \|	diff2 \|	blob \| history
src/or/channel.c	diff1 \|	diff2 \|	blob \| history
src/or/channel.h	diff1 \|	diff2 \|	blob \| history
src/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/or/command.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	diff1 \|	diff2 \|	blob \| history
src/or/geoip.c	diff1 \|	diff2 \|	blob \| history
src/or/geoip.h	diff1 \|	diff2 \|	blob \| history
src/or/include.am	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.c	diff1 \|	diff2 \|	blob \| history
src/or/nodelist.c	diff1 \|	diff2 \|	blob \| history
src/or/nodelist.h	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	diff1 \|	diff2 \|	blob \| history
src/or/rendmid.c	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history
src/test/test.c	diff1 \|	diff2 \|	blob \| history
src/test/test.h	diff1 \|	diff2 \|	blob \| history

Add tor CI config for AppVeyor