]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4db5a1e 2d276ab)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Apr 2012 02:30:02 +0000 (22:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Apr 2012 02:30:02 +0000 (22:30 -0400)
commite9dae1ff2e147d2b74fb1ce2836fb9c42f227af4
tree74e72b9a7c737110f12f4a9d4cd6b8ad30cd3bfbtree | snapshot
parent4db5a1e151a7aa69f2682854b021d1f9bb0f5cafcommit | diff
parent2d276ab9d9193d5152fe2599e9d39f2df9ea7d43commit | diff
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/rendservice.c

Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.
src/or/rendservice.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git