torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	src/or/rendservice.c

Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.
This commit is contained in:
Nick Mathewson
2012-04-18 22:30:02 -04:00
parent 4db5a1e151 2d276ab9d9
commit e9dae1ff2e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug5644
+5
View File
@@ -0,0 +1,5 @@
o Major bugfixes
- Prevent a client-side assertion failure when receiving an
INTRODUCE2 cell by an exit relay, in a general purpose
circuit. Fixes bug 5644; bugfix on tor-0.2.1.6-alpha