[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit f2c170218238a38a0106acb1a7428b514ce979ca
Merge: aa8db01 2b9c5ee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 20:17:17 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/circuitbuild.h

 changes/bug3019       |    4 +++
 src/or/circuitbuild.c |   57 +++++++++++++++++++++++++++++++++++++++++++------
 src/or/circuitbuild.h |    7 +++--
 src/or/config.c       |    3 +-
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --cc src/or/circuitbuild.h
index 33d483d,0e673e1..87adb9a
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@@ -63,12 -62,13 +63,13 @@@ int getinfo_helper_entry_guards(control
                                  const char *question, char **answer,
                                  const char **errmsg);
  
- void clear_bridge_list(void);
+ void mark_bridge_list(void);
+ void sweep_bridge_list(void);
 -int routerinfo_is_a_configured_bridge(routerinfo_t *ri);
 +int routerinfo_is_a_configured_bridge(const routerinfo_t *ri);
- void learned_router_identity(tor_addr_t *addr, uint16_t port,
+ void learned_router_identity(const tor_addr_t *addr, uint16_t port,
                               const char *digest);
  void bridge_add_from_config(const tor_addr_t *addr, uint16_t port,
-                             char *digest);
+                             const char *digest);
  void retry_bridge_descriptor_fetch_directly(const char *digest);
  void fetch_bridge_descriptors(or_options_t *options, time_t now);
  void learned_bridge_descriptor(routerinfo_t *ri, int from_cache);