[tor-commits] [obfsproxy/master] Merge branch 'mem_alloc_main'

[nickm at torproject.org]

commit 3a7183e914e4326c47729e54795f653b7bedc4c6
Merge: e536ae1 731a24d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 14 11:54:43 2011 -0400

    Merge branch 'mem_alloc_main'
    
    Conflicts:
    	src/main.c

 src/main.c |   83 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 49 insertions(+), 34 deletions(-)

diff --cc src/main.c
index b43e1e9,4a6c7d3..2727e72
--- a/src/main.c
+++ b/src/main.c
@@@ -393,8 -366,10 +407,9 @@@ main(int argc, const char **argv
    if (close_obfsproxy_logfile() < 0)
      printf("Failed closing logfile!\n");
  
 +  free_all_listeners(); /* free all listeners in our listener dll */
 +
+   /* We are exiting. Clean everything. */
 -  for (h=0;h<n_listeners;h++)
 -    listener_free(listeners[h]);
 -  free(listeners);
    free(protocol_options);
    free(n_options_array);
    free(protocols);