fix three typos in comments
Build circuits more readily when DisableNetwork goes to 0

When Tor starts with DisabledNetwork set, it would correctly
conclude that it shouldn't try making circuits, but it would
mistakenly cache this conclusion and continue believing it even
when DisableNetwork is set to 0. Fixes the bug introduced by the
fix for bug 11200; bugfix on 0.2.5.4-alpha.
Merge remote-tracking branch 'origin/maint-0.2.5'
fix extra words in man page
Fix some URLs in the README

patch from mttp; fixes 12830
Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails

Cypherpunks found this and wrote this patch.

Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1
Add an extra check in channel_send_destroy for circID==0

Prevents other cases of 12848.
Fix another case of 12848 in circuit_handle_first_hop

I looked for other places where we set circ->n_chan early, and found
one in circuit_handle_first_hop() right before it calls
circuit_send_next_onion_skin(). If onion_skin_create() fails there,
then n_chan will still be set when circuit_send_next_onion_skin()
returns. We should probably fix that too.
Update geoip to the August 7 2014 database.
Update geoip6 to the August 7 2014 database.
Add reallocarray clone so we can stop doing multiply-then-reallocate
Add a simple coccinelle script to replace malloc->calloc

Coccinelle is a semantic patching tool that can automatically change
C code via semantic patching.

This script also replaces realloc with reallocarray as appropriate.
Apply coccinelle script to replace malloc(a*b)->calloc(a,b)
Add changes file for bug12855
Fix whitespace issues
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Merge remote-tracking branch 'origin/maint-0.2.5'
Merge remote-tracking branch 'public/use_calloc'