]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'fallback_dirsource_v3'
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2012 17:42:29 +0000 (12:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2012 17:42:29 +0000 (12:42 -0500)
commit01ac961ca1fc46efeec141ea275c6ea9971c3ee7
tree35f6176135d9bb52900ca0a285619b1fc407e110
parent21b5d76aa57bec3f585634be84884ac8fbb2a10f
parentf742b33d85c0884fa5902d0d24a1232c9bd47dd8
Merge branch 'fallback_dirsource_v3'
doc/tor.1.txt
src/or/dirserv.c
src/or/or.h