Nick Mathewson 8e7ee0e2c0 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

2014-09-11 09:08:50 -04:00

..

bug12160

Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160

2014-09-05 11:12:08 -07:00

bug12908

Warn if Tor is a relay and a HS

2014-08-20 12:56:57 -04:00

bug13096

In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)

2014-09-10 23:48:11 -04:00

bug13124

Reduce log severity for unused ClientTransportPlugin lines

2014-09-11 08:02:37 -04:00