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 branch 'bug7011'

Browse Source 
Conflicts:
	src/or/circuitbuild.c

The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.
This commit is contained in:
Nick Mathewson
2012-10-10 22:31:06 -04:00
parent 8b36d4cc2a e6d1ab3600
commit 7ea904cbc0
13 changed files with 117 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug7011
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes:
- Use square brackets around IPv6 addresses in numerous places that needed
them, including log messages, HTTPS CONNECT proxy requests,
TransportProxy statefile entries, and pluggable transport extra-info
lines. Fix for bug 7011; patch by David Fifield.