]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f35630 bbb8f12)
Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Jun 2014 15:57:56 +0000 (11:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Jun 2014 15:57:56 +0000 (11:57 -0400)
commit3a2e25969fbb7bf38fcfafce676e7f56a1aca118
tree39d1fc39c7a66bfe63a777c0b4d752a6dc56bcaatree | snapshot
parent7f3563058d6b9215fe93116a71db9573e790e017commit | diff
parentbbb8f12ee4efd6f1c2bc8b34dfaf50e314863476commit | diff
Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'

Conflicts:
src/or/channel.c
src/or/circuitlist.c
src/or/connection.c

Conflicts involved removal of next_circ_id and addition of
unusable-circid tracking.
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/circuitlist.c diff1 | diff2 | blob | history
src/or/connection.c diff1 | diff2 | blob | history
src/or/connection_or.c diff1 | diff2 | blob | history
src/or/connection_or.h diff1 | diff2 | blob | history
src/or/main.c diff1 | diff2 | blob | history
src/or/or.h diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git