Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4

[tor.git] / changes / bug9602

 o Bugfixes
   - Null out orconn->chan->conn when closing orconn in case orconn is freed
     before channel_run_cleanup() gets to orconn->chan, and handle the null
     conn edge case correctly in channel_tls_t methods.  Fixes bug #9602;
     bugfix on 0.2.4.4-alpha.